Eskil

Differences From Artifact [0ae38d04d0]:

• File tests/right.txt — part of check-in [fcbb229077] at 2011-04-28 00:55:01 on branch trunk — Added test for merge (user: peter.spjuth@gmail.com size: 513)

To Artifact [77d49be63f]:

• File tests/right.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: 535)

59
60
61
62
63
64
65


66
67
68
69
70
71
72

59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74

+
+

Left: change same Right: add+change
yyyy
46a
47
48
Left: change Right: deleted block
52
Added different
yyyyy
53
54
55
56
57
58
59