_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_CutBothTag.txt

   1 Add\r
   2 1\r
   3 AddLeft\r
   4 2\r
   5 Left\r
   6 4\r
   7 AddRight\r
   8 5\r
   9 AddBoth\r
  10 6\r
  11 <<<<<<< Left.txt\r
  12 AddBothLeft\r
  13 ||||||| RightBase.txt\r
  14 =======\r
  15 AddBothRight\r
  16 >>>>>>> Right.txt\r
  17 7\r
  18 Left\r
  19 8\r
  20 9\r
  21 \r
  22 Modify\r
  23 1\r
  24 ModifyLeft\r
  25 3\r
  26 <<<<<<< Left.txt\r
  27 Left\r
  28 ||||||| RightBase.txt\r
  29 4\r
  30 =======\r
  31 Right\r
  32 >>>>>>> Right.txt\r
  33 5\r
  34 ModifyRight\r
  35 7\r
  36 ModifyBoth\r
  37 9\r
  38 <<<<<<< Left.txt\r
  39 ModifyBothLeft\r
  40 ||||||| RightBase.txt\r
  41 A\r
  42 =======\r
  43 ModifyBothRight\r
  44 >>>>>>> Right.txt\r
  45 B\r
  46 \r
  47 Delete\r
  48 1\r
  49 3\r
  50 Left\r
  51 5\r
  52 <<<<<<< Left.txt\r
  53 6\r
  54 ||||||| RightBase.txt\r
  55 DeleteRight\r
  56 =======\r
  57 >>>>>>> Right.txt\r
  58 7\r
  59 9\r