summaryrefslogtreecommitdiff
path: root/tests.branching/merge-conflict-stratum.script
Commit message (Expand)AuthorAgeFilesLines
* Fix merge tests on Squeeze, by disabling them correctlySam Thursfield2012-09-271-1/+3
* Add merge conflict testsSam Thursfield2012-09-251-0/+117