Version 5.91

[vbslib/main.git] / _src / Test / tools / T_Diff / Files / 4way / LeftMerged3A_CutBothTag.txt

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 (file)
index 0000000..0258de1
--- /dev/null
+++ b/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutBothTag.txt
@@ -0,0 +1,59 @@
+Add\r
+1\r
+AddLeft\r
+2\r
+Left\r
+4\r
+AddRight\r
+5\r
+AddBoth\r
+6\r
+<<<<<<< Left.txt\r
+AddBothLeft\r
+||||||| RightBase.txt\r
+=======\r
+AddBothRight\r
+>>>>>>> Right.txt\r
+7\r
+Left\r
+8\r
+9\r
+\r
+Modify\r
+1\r
+ModifyLeft\r
+3\r
+<<<<<<< Left.txt\r
+Left\r
+||||||| RightBase.txt\r
+4\r
+=======\r
+Right\r
+>>>>>>> Right.txt\r
+5\r
+ModifyRight\r
+7\r
+ModifyBoth\r
+9\r
+<<<<<<< Left.txt\r
+ModifyBothLeft\r
+||||||| RightBase.txt\r
+A\r
+=======\r
+ModifyBothRight\r
+>>>>>>> Right.txt\r
+B\r
+\r
+Delete\r
+1\r
+3\r
+Left\r
+5\r
+<<<<<<< Left.txt\r
+6\r
+||||||| RightBase.txt\r
+DeleteRight\r
+=======\r
+>>>>>>> Right.txt\r
+7\r
+9\r