summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/0b
Commit message (Expand)AuthorAgeFilesLines
* Introduce additional criss-cross merge branchesEdward Thomson2018-02-041-0/+0
* merge: add simple recursive testEdward Thomson2015-11-251-0/+0