kmx git

tests/resources/merge-recursive/.gitted/objects/c4

Commit	Date	Message
b8823c2b	2018-01-22T23:56:22	Add failing test case for virtual commit merge base issue
34a51428	2015-11-09T11:55:26	merge tests: add complex recursive example
86c8d02c	2015-10-22T20:20:07	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.