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

   1 Add\r
   2 1\r
   3 LLL\r
   4 2\r
   5 RRR\r
   6 3\r
   7 Both\r
   8 4\r
   9 <<<<<<< Left.txt\r
  10 LLL\r
  11 =======\r
  12 RRR\r
  13 >>>>>>> Right.txt\r
  14 5\r
  15 <<<<<<< Left.txt\r
  16 Both\r
  17 LLL\r
  18 =======\r
  19 Both\r
  20 RRR\r
  21 >>>>>>> Right.txt\r
  22 6\r
  23 <<<<<<< Left.txt\r
  24 Unique B\r
  25 Unique C\r
  26 =======\r
  27 Unique B\r
  28 Unique D\r
  29 >>>>>>> Right.txt\r
  30 \r
  31 Modify\r
  32 1\r
  33 LLL\r
  34 3\r
  35 RRR\r
  36 5\r
  37 Both\r
  38 7\r
  39 <<<<<<< Left.txt\r
  40 Both\r
  41 LLL\r
  42 =======\r
  43 Both\r
  44 RRR\r
  45 >>>>>>> Right.txt\r
  46 10\r
  47 <<<<<<< Left.txt\r
  48 Single B\r
  49 =======\r
  50 Single C\r
  51 >>>>>>> Right.txt\r
  52 \r
  53 Delete\r
  54 1\r
  55 2\r
  56 3\r
  57 4\r
  58 <<<<<<< Left.txt\r
  59 =======\r
  60 LLL\r
  61 >>>>>>> Right.txt\r
  62 5\r
  63 <<<<<<< Left.txt\r
  64 RRR\r
  65 =======\r
  66 >>>>>>> Right.txt\r
  67 6\r
  68 \r
  69 \82P\r
  70 \8d¶\82É\92Ç\89Á\r
  71 \82Q\r
  72 \89E\82É\92Ç\89Á\r
  73 \82R\r
  74 \97¼\95û\92Ç\89Á\r
  75 \82S\r
  76 <<<<<<< Left.txt\r
  77 \97¼\95û\95Ï\8dX\81i\8d¶\81j\r
  78 =======\r
  79 \97¼\95û\95Ï\8dX\81i\89E\81j\r
  80 >>>>>>> Right.txt\r
  81 \82U\r
  82 \82W\r