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
..
1b392106e079df6d412babd5636697938269ec	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
44d13e2bbc38510320443bbb003f3967d12436	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
cdad903aef3e7b614675e6584a8be417941911	merge: add simple recursive test	2015-11-25 15:37:11 -05:00