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

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

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