X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=_src%2FTest%2Ftools%2FT_Diff%2FFiles%2F4way%2FLeftMerged3A_CutAllTag.txt;fp=_src%2FTest%2Ftools%2FT_Diff%2FFiles%2F4way%2FLeftMerged3A_CutAllTag.txt;h=ea2ebe3396ab78d4bea9b2ee1d35f675d7132485;hb=789b8160859f55b0be4b16cb2a92639ae41d3b51;hp=0000000000000000000000000000000000000000;hpb=b3a835050ab0797a5a3d94ba4e3b6a30670622ae;p=vbslib%2Fmain.git diff --git a/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutAllTag.txt b/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutAllTag.txt new file mode 100644 index 0000000..ea2ebe3 --- /dev/null +++ b/_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutAllTag.txt @@ -0,0 +1,37 @@ +Add +1 +AddLeft +2 +Left +4 +AddRight +5 +AddBoth +6 +AddBothLeft +7 +Left +8 +9 + +Modify +1 +ModifyLeft +3 +Left +5 +ModifyRight +7 +ModifyBoth +9 +ModifyBothLeft +B + +Delete +1 +3 +Left +5 +6 +7 +9