Version 5.91

[vbslib/main.git] / _src / Test / tools / T_Diff / Files / Conflict / DiffOfBaseLeft.txt

diff --git a/_src/Test/tools/T_Diff/Files/Conflict/DiffOfBaseLeft.txt b/_src/Test/tools/T_Diff/Files/Conflict/DiffOfBaseLeft.txt
new file mode 100644 (file)
index 0000000..2dfd26c
--- /dev/null
+++ b/_src/Test/tools/T_Diff/Files/Conflict/DiffOfBaseLeft.txt
@@ -0,0 +1,110 @@
+Add\r
+1\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+LLL\r
+>>>>>>> Conflict\Left.txt\r
+2\r
+3\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+Both\r
+>>>>>>> Conflict\Left.txt\r
+4\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+LLL\r
+>>>>>>> Conflict\Left.txt\r
+5\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+Both\r
+LLL\r
+>>>>>>> Conflict\Left.txt\r
+6\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+Unique B\r
+Unique C\r
+>>>>>>> Conflict\Left.txt\r
+\r
+Modify\r
+1\r
+<<<<<<< Conflict\Base.txt\r
+2\r
+=======\r
+LLL\r
+>>>>>>> Conflict\Left.txt\r
+3\r
+4\r
+5\r
+<<<<<<< Conflict\Base.txt\r
+6\r
+=======\r
+Both\r
+>>>>>>> Conflict\Left.txt\r
+7\r
+<<<<<<< Conflict\Base.txt\r
+8\r
+9\r
+=======\r
+Both\r
+LLL\r
+>>>>>>> Conflict\Left.txt\r
+10\r
+<<<<<<< Conflict\Base.txt\r
+Single A\r
+=======\r
+Single B\r
+>>>>>>> Conflict\Left.txt\r
+\r
+Delete\r
+1\r
+<<<<<<< Conflict\Base.txt\r
+LLL\r
+=======\r
+>>>>>>> Conflict\Left.txt\r
+2\r
+RRR\r
+3\r
+<<<<<<< Conflict\Base.txt\r
+Both\r
+=======\r
+>>>>>>> Conflict\Left.txt\r
+4\r
+<<<<<<< Conflict\Base.txt\r
+Both\r
+LLL\r
+=======\r
+>>>>>>> Conflict\Left.txt\r
+5\r
+<<<<<<< Conflict\Base.txt\r
+Both\r
+=======\r
+>>>>>>> Conflict\Left.txt\r
+RRR\r
+6\r
+\r
+\82P\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+\8d¶\82É\92Ç\89Á\r
+>>>>>>> Conflict\Left.txt\r
+\82Q\r
+\82R\r
+<<<<<<< Conflict\Base.txt\r
+=======\r
+\97¼\95û\92Ç\89Á\r
+>>>>>>> Conflict\Left.txt\r
+\82S\r
+<<<<<<< Conflict\Base.txt\r
+\82T\r
+=======\r
+\97¼\95û\95Ï\8dX\81i\8d¶\81j\r
+>>>>>>> Conflict\Left.txt\r
+\82U\r
+<<<<<<< Conflict\Base.txt\r
+\82V\r
+=======\r
+>>>>>>> Conflict\Left.txt\r
+\82W\r