summaryrefslogtreecommitdiff
path: root/tests.branching/merge-handles-unmergable-cases.script
Commit message (Expand)AuthorAgeFilesLines
* Fix test that should have been doing 'morph edit'Sam Thursfield2012-10-111-0/+2
* tests.branching: Add complex merge testsSam Thursfield2012-09-171-0/+30