libgit2/tests/resources/merge-recursive/.gitted/objects/3a
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
..
3f5a6ec1c968d1d2d5d20dee0d161a4351f279 merge: add simple recursive test 2015-11-25 15:37:11 -05:00