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
..
0b	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
0e	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
0f	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
1c	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
1e	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
3a	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
3b	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
3f	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
4b	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
4c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
4d	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
4e	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
4f	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
5a	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
5b	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
5e	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
5f	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
6c	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
6e	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
7a	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
7c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
7e	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
8a	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
8f	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
9a	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
9b	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
9c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
9e	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
00	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
01	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
05	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
06	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
07	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
12	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
15	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
16	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
21	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
34	merge tests: add complex recursive example	2015-11-25 15:38:33 -05:00
37	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
38	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
41	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
42	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
43	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
48	merge tests: add complex recursive example	2015-11-25 15:38:33 -05:00
50	merge: add a third-level recursive merge	2015-11-25 15:37:28 -05:00
53	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
56	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
63	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
65	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
66	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
68	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
71	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
72	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
73	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
74	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
75	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
78	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
81	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
88	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
89	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
94	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
95	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
96	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
97	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
98	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
a0	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
a2	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
a3	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
a7	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
a8	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
aa	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
ad	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
b2	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
b4	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
b9	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
bd	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
c0	merge: add a second-level recursive merge	2015-11-25 15:37:22 -05:00
c4	merge tests: add complex recursive example	2015-11-25 15:38:33 -05:00
ca	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
cb	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
d0	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
d2	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
d6	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
d7	merge tests: add complex recursive example	2015-11-25 15:38:33 -05:00
d8	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
da	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
db	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
de	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
e1	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
e2	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
e5	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
ef	merge: add recursive test with conflicting contents	2015-11-25 15:37:51 -05:00
f1	merge: add recursive test with three merge bases	2015-11-25 15:37:39 -05:00
f3	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
f5	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
f7	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
fa	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
fd	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
fe	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
ff	merge: add simple recursive test	2015-11-25 15:37:11 -05:00