Add
1
AddLeft
2
Left
4
AddRight
5
<<<<<<< RightBase.txt
=======
AddBoth
>>>>>>> Right.txt
6
<<<<<<< Left.txt
AddBothLeft
||||||| LeftBase.txt
=======
AddBothRight
>>>>>>> Right.txt
7
Left
8
9

Modify
1
ModifyLeft
3
<<<<<<< Left.txt
Left
||||||| LeftBase.txt
4
=======
Right
>>>>>>> Right.txt
5
ModifyRight
7
<<<<<<< RightBase.txt
8
=======
ModifyBoth
>>>>>>> Right.txt
9
<<<<<<< Left.txt
ModifyBothLeft
||||||| LeftBase.txt
A
=======
ModifyBothRight
>>>>>>> Right.txt
B

Delete
1
3
Left
5
<<<<<<< Left.txt
6
||||||| LeftBase.txt
DeleteRight
=======
>>>>>>> Right.txt
7
<<<<<<< RightBase.txt
DeleteBoth
=======
>>>>>>> Right.txt
9
