7 Commits

Author	SHA1	Message	Date
Edward Thomson	78859c6344	merge: handle conflicts in recursive base building ... When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior.	2015-11-25 15:38:39 -05:00
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	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