2 Commits

Author	SHA1	Message	Date
Edward Thomson	cdb6c1c83d	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
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