summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/recursive.c
Commit message (Expand)AuthorAgeFilesLines
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-1/+34
* recursive: test conflict output during recursive mergeEdward Thomson2015-11-251-0/+51