kmx git

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

Commit	Date	Message
7bd89502	2018-01-21T16:41:49	Introduce additional criss-cross merge branches
fccad82e	2015-10-27T14:23:35	merge: add recursive test with three merge bases
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.