summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/de/a7215f259b2cced87d1bda6c72f8b4ce37a2ff
Commit message (Expand)AuthorAgeFilesLines
* merge: add simple recursive testEdward Thomson2015-11-251-0/+0