summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-chunks.script
Commit message (Expand)AuthorAgeFilesLines
* Fix mistake in renaming tests that breaks ./check on SqueezeSam Thursfield2012-10-311-2/+2
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-0/+85