libgit2/tests/resources/merge-recursive/.gitted/objects/88
Edward Thomson 86c8d02c07 merge: add simple recursive test
Add a simple recursive test - where multiple ancestors exist and
creating a virtual merge base from them would prevent a conflict.
2015-11-25 15:37:11 -05:00
..
eb3f98849f4b8d0555395f514800900a01dc8f merge: add simple recursive test 2015-11-25 15:37:11 -05:00