| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: add simple recursive test | Edward Thomson | 2015-11-25 | 1 | -0/+0 |
| Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict. | |||||
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |
path: root/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba