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