summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/94
Commit message (Collapse)AuthorAgeFilesLines
* merge: add simple recursive testEdward Thomson2015-11-251-0/+0
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.