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
..
7d316d6d9af99d2481e980d68b77e572d80fe7	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
49d1a8b6116ffeba22667bba265fa5261df7ab	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
224bba0a8a24f1768804fe5f565b1014af7ef2	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
fa936d25f0b397432a27201f6b3284c47df8be	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00