summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/d2
Commit message (Expand)AuthorAgeFilesLines
* merge: add recursive test with three merge basesEdward Thomson2015-11-251-0/+1