7 Commits

Author	SHA1	Message	Date
Edward Thomson	34a51428a1	merge tests: add complex recursive example	2015-11-25 15:38:33 -05:00
Edward Thomson	b1eef912cf	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
Edward Thomson	fccad82ee8	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
Edward Thomson	99d9d9a470	merge: improve test names in recursive merge tests	2015-11-25 15:37:33 -05:00
Edward Thomson	a200bcf728	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
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