summaryrefslogtreecommitdiff
path: root/tests.branching/merge-conflict-chunks.script
Commit message (Expand)AuthorAgeFilesLines
* Remove obsolete merging hack from merge conflict testSam Thursfield2012-09-271-12/+0
* Fix merge tests on Squeeze, by disabling them correctlySam Thursfield2012-09-271-0/+2
* Add merge conflict testsSam Thursfield2012-09-251-0/+95