summaryrefslogtreecommitdiff
path: root/tests.branching/merge.stdout
Commit message (Expand)AuthorAgeFilesLines
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-5/+0
* morph merge: Don't make a merge commit if only the refs changedSam Thursfield2012-09-141-1/+1
* morph merge: Give consistent commit message in chunk reposSam Thursfield2012-09-111-0/+5