summaryrefslogtreecommitdiff
path: root/tests.branching/merge-with-chunk-repo-moved.stderr
Commit message (Collapse)AuthorAgeFilesLines
* tests.branching: Add complex merge testsSam Thursfield2012-09-171-0/+1
* Spot completely unmergable cases * Make sure that changes in a chunk repo are merged to the back to that chunk's original ref, which is not necessarily the same as the TO system branch. * Test renaming a chunk (works fine if repo is the same) * Try adding a new chunk or stratum and editing it too.