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

<<<<<<< Left.txt
=======
||||||| LeftBase.txt
4
Right
>>>>>>> Right.txt
3
<<<<<<< Left.txt
6
=======
ModifyRight
>>>>>>> Right.txt
Left
<<<<<<< Left.txt
=======
<<<<<<< LeftBase.txt
8
>>>>>>> Right.txt
=======
Right
>>>>>>> Right.txt
<<<<<<< Left.txt
=======
||||||| LeftBase.txt
A
ModifyBothRight
>>>>>>> Right.txt
<<<<<<< LeftBase.txt
8
=======
ModifyBoth
<<<<<<< Left.txt
=======
||||||| LeftBase.txt
DeleteLeft
2
>>>>>>> Right.txt
ModifyBothLeft
<<<<<<< Left.txt
Left
=======
Right
>>>>>>> Right.txt
A
<<<<<<< Left.txt
6
=======
>>>>>>> Right.txt
=======
<<<<<<< Left.txt
=======
<<<<<<< LeftBase.txt
DeleteBoth
>>>>>>> Right.txt
B

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