Eskil

Differences From Artifact [b7eea6191a]:

• File tests/ancestor.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: 509)

To Artifact [c983284355]:

• File tests/ancestor.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: 525)

61
62
63
64
65
66
67

68
69
70
71
72
73
74

47
48
Left: change Right: deleted block
49
50
51
52

53
54
55
56
57
58
59

>

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

47
48
Left: change Right: deleted block
49
50
51
52
Added different
53
54
55
56
57
58
59