_src/Test/tools/T_Diff/Files/4way/LeftMerged3A_LR.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 <<<<<<< RightBase.txt\r
  10 =======\r
  11 AddBoth\r
  12 >>>>>>> Right.txt\r
  13 6\r
  14 <<<<<<< Left.txt\r
  15 AddBothLeft\r
  16 ||||||| LeftBase.txt\r
  17 =======\r
  18 AddBothRight\r
  19 >>>>>>> Right.txt\r
  20 7\r
  21 Left\r
  22 8\r
  23 9\r
  24 \r
  25 Modify\r
  26 1\r
  27 ModifyLeft\r
  28 3\r
  29 <<<<<<< Left.txt\r
  30 Left\r
  31 ||||||| LeftBase.txt\r
  32 4\r
  33 =======\r
  34 Right\r
  35 >>>>>>> Right.txt\r
  36 5\r
  37 ModifyRight\r
  38 7\r
  39 <<<<<<< RightBase.txt\r
  40 8\r
  41 =======\r
  42 ModifyBoth\r
  43 >>>>>>> Right.txt\r
  44 9\r
  45 <<<<<<< Left.txt\r
  46 ModifyBothLeft\r
  47 ||||||| LeftBase.txt\r
  48 A\r
  49 =======\r
  50 ModifyBothRight\r
  51 >>>>>>> Right.txt\r
  52 B\r
  53 \r
  54 Delete\r
  55 1\r
  56 3\r
  57 Left\r
  58 5\r
  59 <<<<<<< Left.txt\r
  60 6\r
  61 ||||||| LeftBase.txt\r
  62 DeleteRight\r
  63 =======\r
  64 >>>>>>> Right.txt\r
  65 7\r
  66 <<<<<<< RightBase.txt\r
  67 DeleteBoth\r
  68 =======\r
  69 >>>>>>> Right.txt\r
  70 9\r