summaryrefslogtreecommitdiff
path: root/tests.branching/merge-warns-if-merging-petrified-morphologies.stdout
Commit message (Expand)AuthorAgeFilesLines
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-1/+0
* Merge remote-tracking branch 'origin/samthursfield/S4873-warn-when-merge-caus...Daniel Silverstone2012-10-111-0/+1