0
1
Added left
x
2
3
4
Added right
y
5
6
7
Changed same
8a
9
10
Changed different
<<<<<<< HEAD
12b
=======
12a
>>>>>>> main
13
14
Deleted left
17
18
Deleted right
20
21
Left: Add+change Right: change
<<<<<<< HEAD
22b
23
24
Left: change Right add+change
yy
25b
26
27
Left: Delete Right: change
28a
29
30
Left: change Right: delete
=======
xx
22a
23
24
Left: change Right add+change
25a
26
27
Left: Delete Right: change
29
30
Left: change Right: delete
31a
>>>>>>> main
32
33
Added same
xxx
34
35
36
Deleted same
38
39
Changed adjacent
<<<<<<< HEAD
40
41a
42
Left: Add+change Right: change same
=======
40a
41
42
Left: Add+change Right: change same
xxxx
>>>>>>> main
43a
44
45
Left: change same Right: add+change
<<<<<<< HEAD
yyyy
=======
>>>>>>> main
46a
47
48
Left: change Right: deleted block
<<<<<<< HEAD
52
Added different
yyyyy
=======
49
50a
51
52
Added different
xxxxx
>>>>>>> main
53
54
55
Left mixed change
57x
59
60
Right mixed change
61x
63x
64
65
Both added multiple
<<<<<<< HEAD
yy1
yy2
=======
xx1
xx2
>>>>>>> main
66
67