summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/a6
Commit message (Expand)AuthorAgeFilesLines
* Introduce additional criss-cross merge branchesEdward Thomson2018-02-041-0/+0