_src/Test/tools/T_Diff/Files/4way/RightMergedAnswer.txt

   1 Add\r
   2 1\r
   3 <<<<<<< Added\r
   4 AddLeft\r
   5 =======\r
   6 >>>>>>> Added\r
   7 2\r
   8 Right\r
   9 4\r
  10 AddRight\r
  11 5\r
  12 AddBoth\r
  13 6\r
  14 <<<<<<< Left.txt\r
  15 AddBothLeft\r
  16 ||||||| RightBase.txt\r
  17 =======\r
  18 AddBothRight\r
  19 >>>>>>> Right.txt\r
  20 7\r
  21 8\r
  22 Right\r
  23 9\r
  24 \r
  25 Modify\r
  26 1\r
  27 <<<<<<< Left.txt\r
  28 ModifyLeft\r
  29 ||||||| RightBase.txt\r
  30 2\r
  31 =======\r
  32 >>>>>>> Right.txt\r
  33 3\r
  34 <<<<<<< Left.txt\r
  35 Left\r
  36 ||||||| RightBase.txt\r
  37 4\r
  38 =======\r
  39 Right\r
  40 >>>>>>> Right.txt\r
  41 5\r
  42 <<<<<<< Left.txt\r
  43 ||||||| RightBase.txt\r
  44 6\r
  45 =======\r
  46 ModifyRight\r
  47 >>>>>>> Right.txt\r
  48 7\r
  49 ModifyBoth\r
  50 9\r
  51 <<<<<<< Left.txt\r
  52 ModifyBothLeft\r
  53 ||||||| RightBase.txt\r
  54 A\r
  55 =======\r
  56 ModifyBothRight\r
  57 >>>>>>> Right.txt\r
  58 B\r
  59 \r
  60 Delete\r
  61 1\r
  62 <<<<<<< Left.txt\r
  63 ||||||| LeftBase.txt\r
  64 DeleteLeft\r
  65 =======\r
  66 2\r
  67 >>>>>>> Right.txt\r
  68 3\r
  69 Right\r
  70 5\r
  71 7\r
  72 <<<<<<< LeftBase.txt\r
  73 DeleteBoth\r
  74 =======\r
  75 >>>>>>> Right.txt\r
  76 9\r