summaryrefslogtreecommitdiff
path: root/tests.branching/merge-conflict-stratum.stdout
Commit message (Expand)AuthorAgeFilesLines
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-2/+0
* morph merge: Rework how we interact with gitSam Thursfield2012-10-031-6/+2
* morph merge: Use a special git merge driver for morphology filesSam Thursfield2012-09-271-2/+1
* Add merge conflict testsSam Thursfield2012-09-251-0/+7