_src/Test/tools/T_Diff/Files/Conflict/DiffOfBaseLeft.txt

   1 Add\r
   2 1\r
   3 <<<<<<< Conflict\Base.txt\r
   4 =======\r
   5 LLL\r
   6 >>>>>>> Conflict\Left.txt\r
   7 2\r
   8 3\r
   9 <<<<<<< Conflict\Base.txt\r
  10 =======\r
  11 Both\r
  12 >>>>>>> Conflict\Left.txt\r
  13 4\r
  14 <<<<<<< Conflict\Base.txt\r
  15 =======\r
  16 LLL\r
  17 >>>>>>> Conflict\Left.txt\r
  18 5\r
  19 <<<<<<< Conflict\Base.txt\r
  20 =======\r
  21 Both\r
  22 LLL\r
  23 >>>>>>> Conflict\Left.txt\r
  24 6\r
  25 <<<<<<< Conflict\Base.txt\r
  26 =======\r
  27 Unique B\r
  28 Unique C\r
  29 >>>>>>> Conflict\Left.txt\r
  30 \r
  31 Modify\r
  32 1\r
  33 <<<<<<< Conflict\Base.txt\r
  34 2\r
  35 =======\r
  36 LLL\r
  37 >>>>>>> Conflict\Left.txt\r
  38 3\r
  39 4\r
  40 5\r
  41 <<<<<<< Conflict\Base.txt\r
  42 6\r
  43 =======\r
  44 Both\r
  45 >>>>>>> Conflict\Left.txt\r
  46 7\r
  47 <<<<<<< Conflict\Base.txt\r
  48 8\r
  49 9\r
  50 =======\r
  51 Both\r
  52 LLL\r
  53 >>>>>>> Conflict\Left.txt\r
  54 10\r
  55 <<<<<<< Conflict\Base.txt\r
  56 Single A\r
  57 =======\r
  58 Single B\r
  59 >>>>>>> Conflict\Left.txt\r
  60 \r
  61 Delete\r
  62 1\r
  63 <<<<<<< Conflict\Base.txt\r
  64 LLL\r
  65 =======\r
  66 >>>>>>> Conflict\Left.txt\r
  67 2\r
  68 RRR\r
  69 3\r
  70 <<<<<<< Conflict\Base.txt\r
  71 Both\r
  72 =======\r
  73 >>>>>>> Conflict\Left.txt\r
  74 4\r
  75 <<<<<<< Conflict\Base.txt\r
  76 Both\r
  77 LLL\r
  78 =======\r
  79 >>>>>>> Conflict\Left.txt\r
  80 5\r
  81 <<<<<<< Conflict\Base.txt\r
  82 Both\r
  83 =======\r
  84 >>>>>>> Conflict\Left.txt\r
  85 RRR\r
  86 6\r
  87 \r
  88 \82P\r
  89 <<<<<<< Conflict\Base.txt\r
  90 =======\r
  91 \8d¶\82É\92Ç\89Á\r
  92 >>>>>>> Conflict\Left.txt\r
  93 \82Q\r
  94 \82R\r
  95 <<<<<<< Conflict\Base.txt\r
  96 =======\r
  97 \97¼\95û\92Ç\89Á\r
  98 >>>>>>> Conflict\Left.txt\r
  99 \82S\r
 100 <<<<<<< Conflict\Base.txt\r
 101 \82T\r
 102 =======\r
 103 \97¼\95û\95Ï\8dX\81i\8d¶\81j\r
 104 >>>>>>> Conflict\Left.txt\r
 105 \82U\r
 106 <<<<<<< Conflict\Base.txt\r
 107 \82V\r
 108 =======\r
 109 >>>>>>> Conflict\Left.txt\r
 110 \82W\r