summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-morphology-kind.script
Commit message (Expand)AuthorAgeFilesLines
* Tidy up command testsSam Thursfield2012-11-141-1/+2
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-4/+4
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-0/+32