summaryrefslogtreecommitdiff
path: root/tests.branching/merge-handles-unmergable-cases.stderr
Commit message (Expand)AuthorAgeFilesLines
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-1/+0
* morph merge: Warn if a merge will cause unexpected petrificationSam Thursfield2012-10-111-1/+1
* Fix after reviewSam Thursfield2012-10-031-1/+1
* tests.branching: Add complex merge testsSam Thursfield2012-09-171-0/+1