summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/6c
Commit message (Expand)AuthorAgeFilesLines
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-0/+0