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