summaryrefslogtreecommitdiff
path: root/tests.branching/merge-conflict-stratum.exit
Commit message (Expand)AuthorAgeFilesLines
* Add merge conflict testsSam Thursfield2012-09-251-0/+1