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