summaryrefslogtreecommitdiff
path: root/tests.branching/merge-conflict-stratum.stderr
Commit message (Expand)AuthorAgeFilesLines
* morph merge: Rework how we interact with gitSam Thursfield2012-10-031-1/+1
* morph merge: Error message wranglingSam Thursfield2012-09-271-1/+1
* Add merge conflict testsSam Thursfield2012-09-251-0/+1