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