Eskil

Differences From Artifact [ed928d9b3a]:

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

To 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)

35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

35
36
37
38
39
40
41

42
43
44
45
46
47
48

-

26
27
Left: Delete  Right: change
28a
29
30
Left: change  Right: delete
31a
32
33
Added same
xxx
34
35
36

61
62
63
64
65
66
67
68
69
70
71



72
73
74
75
76
77
78

60
61
62
63
64
65
66



67
68
69
70
71
72
73
74
75
76
77

-
-
-

+
+
+

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