kmx git

tests/resources/merge-recursive

Commit	Date	Message
a200bcf7	2015-10-26T17:25:42	merge: add a third-level recursive merge
cdb6c1c8	2015-10-26T17:14:28	merge: add a second-level recursive merge
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.