summaryrefslogtreecommitdiff
path: root/tests.branching/merge-with-stratum-renamed.stderr
Commit message (Expand)AuthorAgeFilesLines
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-1/+0
* morph merge: Rework how we interact with gitSam Thursfield2012-10-031-1/+1
* tests.branching: Add complex merge testsSam Thursfield2012-09-171-0/+1