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