summaryrefslogtreecommitdiff
path: root/tests.branching/merge-conflict-stratum.script
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead code from the end of testSam Thursfield2012-09-271-20/+1
| | | | | This code made no sense, but since the previous command was expected to fail it didn't have any effect on the test.
* Fix merge tests on Squeeze, by disabling them correctlySam Thursfield2012-09-271-1/+3
|
* Add merge conflict testsSam Thursfield2012-09-251-0/+117