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