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

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

Delete
1
<<<<<<< Left.txt
||||||| LeftBase.txt
DeleteLeft
=======
2
>>>>>>> Right.txt
3
Right
5
7
<<<<<<< LeftBase.txt
DeleteBoth
=======
>>>>>>> Right.txt
9