Eskil

Differences From Artifact [acf504d321]:

• File tests/merge.txt — part of check-in [2f126fd631] at 2011-04-29 23:53:15 on branch trunk — Improved three-way merge (user: peter.spjuth@gmail.com size: 549)

To Artifact [dcb1abc760]:

• File tests/merge.txt — part of check-in [118eb090c6] at 2011-04-30 01:10:17 on branch trunk — More merge conflict cases handled (user: peter.spjuth@gmail.com size: 640) [more...]

67
68
69
70
71
72
73
74

75
76
77

52
Added different
xxxxx
yyyyy
53
54
55
56

57
58
59

<
>
|
<

>
>
>
>
>
>
>
>
>
>
>
>
>

67
68
69
70
71
72
73

74
75

76
77
78
79
80
81
82
83
84
85
86
87
88
89

52
Added different
xxxxx
yyyyy
53
54
55

Left mixed change
57x

59
60
Right mixed change
61x
63x
64
65
Both added multiple
xx1
xx2
yy1
yy2
66
67