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

   1 Add\r
   2 1\r
   3 <<<<<<< LeftBase.txt\r
   4 =======\r
   5 AddLeft\r
   6 >>>>>>> Left.txt\r
   7 2\r
   8 Left\r
   9 4\r
  10 5\r
  11 <<<<<<< LeftBase.txt\r
  12 =======\r
  13 AddBoth\r
  14 >>>>>>> Left.txt\r
  15 6\r
  16 <<<<<<< LeftBase.txt\r
  17 =======\r
  18 AddBothLeft\r
  19 >>>>>>> Left.txt\r
  20 7\r
  21 Left\r
  22 8\r
  23 9\r
  24 \r
  25 Modify\r
  26 1\r
  27 <<<<<<< LeftBase.txt\r
  28 2\r
  29 =======\r
  30 ModifyLeft\r
  31 >>>>>>> Left.txt\r
  32 3\r
  33 <<<<<<< LeftBase.txt\r
  34 4\r
  35 =======\r
  36 Left\r
  37 >>>>>>> Left.txt\r
  38 5\r
  39 6\r
  40 7\r
  41 <<<<<<< LeftBase.txt\r
  42 8\r
  43 =======\r
  44 ModifyBoth\r
  45 >>>>>>> Left.txt\r
  46 9\r
  47 <<<<<<< LeftBase.txt\r
  48 A\r
  49 =======\r
  50 ModifyBothLeft\r
  51 >>>>>>> Left.txt\r
  52 B\r
  53 \r
  54 Delete\r
  55 1\r
  56 <<<<<<< LeftBase.txt\r
  57 DeleteLeft\r
  58 =======\r
  59 >>>>>>> Left.txt\r
  60 3\r
  61 Left\r
  62 5\r
  63 6\r
  64 7\r
  65 <<<<<<< LeftBase.txt\r
  66 DeleteBoth\r
  67 =======\r
  68 >>>>>>> Left.txt\r
  69 9\r