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