X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=_src%2FTest%2Ftools%2FT_Diff%2FFiles%2F4way%2FLeftMerged3A_CutBothTag.txt;fp=_src%2FTest%2Ftools%2FT_Diff%2FFiles%2F4way%2FLeftMerged3A_CutBothTag.txt;h=0258de1ec3d5ef47b27eab10b94c4653dd9afccf;hb=789b8160859f55b0be4b16cb2a92639ae41d3b51;hp=0000000000000000000000000000000000000000;hpb=b3a835050ab0797a5a3d94ba4e3b6a30670622ae;p=vbslib%2Fmain.git

diff --git a/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutBothTag.txt b/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutBothTag.txt
new file mode 100644
index 0000000..0258de1
--- /dev/null
+++ b/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutBothTag.txt
@@ -0,0 +1,59 @@
+Add
+1
+AddLeft
+2
+Left
+4
+AddRight
+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
+ModifyRight
+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