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