summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-chunks.stdout
Commit message (Expand)AuthorAgeFilesLines
* Exorcise some old and unused commandsRichard Maw2014-07-071-4/+0
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-2/+2
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-0/+4