summaryrefslogtreecommitdiff
path: root/tests.branching/merge-with-chunk-repo-moved.script
Commit message (Expand)AuthorAgeFilesLines
* Fix merge tests on Squeeze, by disabling them correctlySam Thursfield2012-09-271-0/+7
* tests.branching: Add complex merge testsSam Thursfield2012-09-171-0/+53