summaryrefslogtreecommitdiff
path: root/tests.merging
Commit message (Collapse)AuthorAgeFilesLines
* Fix mistake in renaming tests that breaks ./check on SqueezeSam Thursfield2012-10-313-4/+4
|
* Add missing teardown script to tests.mergingSam Thursfield2012-10-311-0/+22
|
* Split merge tests out from the other branching testsSam Thursfield2012-10-2924-0/+688
Merge is by far the most complex of the branching and merging commands.