_src/Test/tools/T_Diff/Files/Merge.C.replace.xml

   1 <?xml version="1.0" encoding="UTF-8"?><MultiText>\r
   2 <ReplaceTemplate  before="#BeforeA1"  after="#AfterA1"/>\r
   3 <ReplaceTemplate  before="#BeforeA2"  after="#AfterA2"/>\r
   4 <ReplaceTemplate  before="#BeforeA3"  after="#AfterA3"/>\r
   5         <!-- A = Add -->\r
   6 \r
   7 <ReplaceTemplate  before="#BeforeM1"  after="#AfterM1"/>\r
   8 <ReplaceTemplate  before="#BeforeM2"  after="#AfterM2"/>\r
   9 <ReplaceTemplate  before="#BeforeM3"  after="#AfterM3"/>\r
  10 <ReplaceTemplate  before="#BeforeM4"  after="#AfterM4"/>\r
  11         <!-- M = Modify -->\r
  12 \r
  13 \r
  14 <Text id="BeforeA1"><![CDATA[\r
  15 ----------------------------------------------------------------------------\r
  16 <<<<<<< Left.txt\r
  17 LLL\r
  18 ||||||| Base.txt\r
  19 =======\r
  20 RRR\r
  21 >>>>>>> Right.txt\r
  22 ----------------------------------------------------------------------------\r
  23 ]]></Text>\r
  24 \r
  25 \r
  26 <Text id="AfterA1"><![CDATA[\r
  27 ----------------------------------------------------------------------------\r
  28 LLL\r
  29 \r
  30 RRR\r
  31 ----------------------------------------------------------------------------\r
  32 ]]></Text>\r
  33 \r
  34 \r
  35 <Text id="BeforeA2"><![CDATA[\r
  36 ----------------------------------------------------------------------------\r
  37 <<<<<<< Left.txt\r
  38 Both\r
  39 LLL\r
  40 ||||||| Base.txt\r
  41 =======\r
  42 Both\r
  43 RRR\r
  44 >>>>>>> Right.txt\r
  45 ----------------------------------------------------------------------------\r
  46 ]]></Text>\r
  47 \r
  48 \r
  49 <Text id="AfterA2"><![CDATA[\r
  50 ----------------------------------------------------------------------------\r
  51 Both\r
  52 LLL\r
  53 \r
  54 Both\r
  55 RRR\r
  56 ----------------------------------------------------------------------------\r
  57 ]]></Text>\r
  58 \r
  59 \r
  60 <Text id="BeforeA3"><![CDATA[\r
  61 ----------------------------------------------------------------------------\r
  62 <<<<<<< Left.txt\r
  63 Unique B\r
  64 Unique C\r
  65 ||||||| Base.txt\r
  66 =======\r
  67 Unique B\r
  68 Unique D\r
  69 >>>>>>> Right.txt\r
  70 ----------------------------------------------------------------------------\r
  71 ]]></Text>\r
  72 \r
  73 \r
  74 <Text id="AfterA3"><![CDATA[\r
  75 ----------------------------------------------------------------------------\r
  76 Replaced Unique BCD\r
  77 ----------------------------------------------------------------------------\r
  78 ]]></Text>\r
  79 \r
  80 \r
  81 <Text id="BeforeM1"><![CDATA[\r
  82 ----------------------------------------------------------------------------\r
  83 <<<<<<< Left.txt\r
  84 Both\r
  85 LLL\r
  86 ||||||| Base.txt\r
  87 8\r
  88 9\r
  89 =======\r
  90 Both\r
  91 RRR\r
  92 >>>>>>> Right.txt\r
  93 ----------------------------------------------------------------------------\r
  94 ]]></Text>\r
  95 \r
  96 \r
  97 <Text id="AfterM1"><![CDATA[\r
  98 ----------------------------------------------------------------------------\r
  99 Both\r
 100 LLL\r
 101 RRR\r
 102 ----------------------------------------------------------------------------\r
 103 ]]></Text>\r
 104 \r
 105 \r
 106 <Text id="BeforeM2"><![CDATA[\r
 107 ----------------------------------------------------------------------------\r
 108 <<<<<<< Left.txt\r
 109 ||||||| Base.txt\r
 110 Both\r
 111 LLL\r
 112 =======\r
 113 LLL\r
 114 >>>>>>> Right.txt\r
 115 ${Middle}\r
 116 <<<<<<< Left.txt\r
 117 RRR\r
 118 ||||||| Base.txt\r
 119 ${Base}\r
 120 =======\r
 121 >>>>>>> Right.txt\r
 122 ----------------------------------------------------------------------------\r
 123 ]]></Text>\r
 124 \r
 125 \r
 126 <Text id="AfterM2"><![CDATA[\r
 127 ----------------------------------------------------------------------------\r
 128 LLL\r
 129 ${Middle}\r
 130 RRR\r
 131 ----------------------------------------------------------------------------\r
 132 ]]></Text>\r
 133 \r
 134 \r
 135 <Text id="BeforeM3"><![CDATA[\r
 136 ----------------------------------------------------------------------------\r
 137 <<<<<<< Left.txt\r
 138 Single B\r
 139 ||||||| Base.txt\r
 140 Single A\r
 141 =======\r
 142 Single C\r
 143 >>>>>>> Right.txt\r
 144 ----------------------------------------------------------------------------\r
 145 ]]></Text>\r
 146 \r
 147 \r
 148 <Text id="AfterM3"><![CDATA[\r
 149 ----------------------------------------------------------------------------\r
 150 Replaced Single ABC\r
 151 ----------------------------------------------------------------------------\r
 152 ]]></Text>\r
 153 \r
 154 \r
 155 <Text id="BeforeM4"><![CDATA[\r
 156 ----------------------------------------------------------------------------\r
 157 <<<<<<< Left.txt\r
 158 ${Left}\r
 159 ||||||| Base.txt\r
 160 ５\r
 161 =======\r
 162 ${Right}\r
 163 >>>>>>> Right.txt\r
 164 ----------------------------------------------------------------------------\r
 165 ]]></Text>\r
 166 \r
 167 \r
 168 <Text id="AfterM4"><![CDATA[\r
 169 ----------------------------------------------------------------------------\r
 170 \r
 171 ${Left}\r
 172 \r
 173 ${Right}\r
 174 \r
 175 ----------------------------------------------------------------------------\r
 176 ]]></Text>\r
 177 \r
 178 \r
 179 </MultiText>\r