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