1 <?xml version="1.0" encoding="UTF-8"?><MultiText>
\r
2 <!-- ************************************************************ -->
\r
4 <Text id="Add1_MergeOption">
\r
7 <Text id="Add1_Before"><![CDATA[
\r
8 ------------------------------
\r
17 ------------------------------
\r
18 ]]></Text><Text id="Add1_After"><![CDATA[
\r
19 ------------------------------
\r
25 ------------------------------
\r
27 <Text id="Add1_IsConflicted">No</Text>
\r
30 <!-- ************************************************************ -->
\r
31 <Text id="Add2_MergeOption">
\r
34 <Text id="Add2_Before"><![CDATA[
\r
35 ------------------------------
\r
42 ------------------------------
\r
43 ]]></Text><Text id="Add2_After"><![CDATA[
\r
44 ------------------------------
\r
51 ------------------------------
\r
53 <Text id="Add2_IsConflicted">Yes</Text>
\r
56 <!-- ************************************************************ -->
\r
57 <Text id="Add3_MergeOption">
\r
60 <Text id="Add3_Before"><![CDATA[
\r
61 ------------------------------
\r
68 ------------------------------
\r
69 ]]></Text><Text id="Add3_After"><![CDATA[
\r
70 ------------------------------
\r
74 ------------------------------
\r
76 <Text id="Add3_IsConflicted">No</Text>
\r
79 <!-- ************************************************************ -->
\r
80 <Text id="Add4_MergeOption">
\r
83 <Text id="Add4_Before"><![CDATA[
\r
84 ------------------------------
\r
95 ------------------------------
\r
96 ]]></Text><Text id="Add4_After"><![CDATA[
\r
97 ------------------------------
\r
105 ------------------------------
\r
107 <Text id="Add4_IsConflicted">No</Text>
\r
110 <!-- ************************************************************ -->
\r
111 <Text id="Add5_MergeOption">
\r
114 <Text id="Add5_Before"><![CDATA[
\r
115 ------------------------------
\r
116 UniqueLineKeyword X
\r
118 UniqueLineKeyword A
\r
121 UniqueLineKeyword A
\r
122 UniqueLineKeyword B
\r
124 UniqueLineKeyword Y
\r
125 ------------------------------
\r
126 ]]></Text><Text id="Add5_After"><![CDATA[
\r
127 ------------------------------
\r
128 UniqueLineKeyword X
\r
129 UniqueLineKeyword A
\r
130 UniqueLineKeyword B
\r
131 UniqueLineKeyword Y
\r
132 ------------------------------
\r
134 <Text id="Add5_IsConflicted">No</Text>
\r
137 <!-- ************************************************************ -->
\r
138 <Text id="Add6_MergeOption">
\r
141 <Text id="Add6_Before"><![CDATA[
\r
142 ------------------------------
\r
143 UniqueLineKeyword F
\r
145 UniqueLineKeyword A
\r
146 UniqueLineKeyword D
\r
148 UniqueLineKeyword A
\r
151 UniqueLineKeyword A
\r
152 UniqueLineKeyword B
\r
153 UniqueLineKeyword C
\r
154 UniqueLineKeyword E
\r
155 UniqueLineKeyword F
\r
156 UniqueLineKeyword D
\r
158 UniqueLineKeyword C
\r
159 UniqueLineKeyword B
\r
161 UniqueLineKeyword E
\r
162 ------------------------------
\r
163 ]]></Text><Text id="Add6_After"><![CDATA[
\r
164 ------------------------------
\r
165 UniqueLineKeyword F
\r
167 UniqueLineKeyword A
\r
168 UniqueLineKeyword D
\r
169 UniqueLineKeyword E
\r
170 UniqueLineKeyword F
\r
171 UniqueLineKeyword C
\r
172 UniqueLineKeyword B
\r
174 UniqueLineKeyword E
\r
175 ------------------------------
\r
177 <Text id="Add6_IsConflicted">No</Text>
\r
180 <!-- ************************************************************ -->
\r
181 <Text id="Modify1_MergeOption">
\r
184 <Text id="Modify1_Before"><![CDATA[
\r
185 ------------------------------
\r
191 ------------------------------
\r
192 ]]></Text><Text id="Modify1_After"><![CDATA[
\r
193 ------------------------------
\r
195 ------------------------------
\r
197 <Text id="Modify1_IsConflicted">No</Text>
\r
200 <!-- ************************************************************ -->
\r
201 <Text id="Modify2_MergeOption">
\r
204 <Text id="Modify2_Before"><![CDATA[
\r
205 ------------------------------
\r
213 ------------------------------
\r
214 ]]></Text><Text id="Modify2_After"><![CDATA[
\r
215 ------------------------------
\r
217 ------------------------------
\r
219 <Text id="Modify2_IsConflicted">No</Text>
\r
222 <!-- ************************************************************ -->
\r
223 <Text id="Modify3_MergeOption">
\r
226 <Text id="Modify3_Before"><![CDATA[
\r
227 ------------------------------
\r
237 ------------------------------
\r
238 ]]></Text><Text id="Modify3_After"><![CDATA[
\r
239 ------------------------------
\r
243 ------------------------------
\r
245 <Text id="Modify3_IsConflicted">No</Text>
\r
248 <!-- ************************************************************ -->
\r
249 <Text id="Modify4_MergeOption">
\r
252 <Text id="Modify4_Before"><![CDATA[
\r
253 ------------------------------
\r
266 ------------------------------
\r
267 ]]></Text><Text id="Modify4_After"><![CDATA[
\r
268 ------------------------------
\r
270 ------------------------------
\r
272 <Text id="Modify4_IsConflicted">No</Text>
\r
275 <!-- ************************************************************ -->
\r
276 <Text id="Modify5_MergeOption">
\r
279 <Text id="Modify5_Before"><![CDATA[
\r
280 ------------------------------
\r
281 UniqueLineKeyword F
\r
283 UniqueLineKeyword A
\r
284 UniqueLineKeyword D
\r
286 UniqueLineKeyword A
\r
288 UniqueLineKeyword X
\r
289 UniqueLineKeyword E
\r
291 UniqueLineKeyword A
\r
292 UniqueLineKeyword B
\r
293 UniqueLineKeyword C
\r
294 UniqueLineKeyword E
\r
295 UniqueLineKeyword F
\r
296 UniqueLineKeyword D
\r
298 UniqueLineKeyword C
\r
299 UniqueLineKeyword B
\r
301 UniqueLineKeyword E
\r
302 ------------------------------
\r
303 ]]></Text><Text id="Modify5_After"><![CDATA[
\r
304 ------------------------------
\r
305 UniqueLineKeyword F
\r
307 UniqueLineKeyword A
\r
308 UniqueLineKeyword D
\r
309 UniqueLineKeyword E
\r
310 UniqueLineKeyword F
\r
311 UniqueLineKeyword C
\r
312 UniqueLineKeyword B
\r
314 UniqueLineKeyword E
\r
315 ------------------------------
\r
317 <Text id="Modify5_IsConflicted">No</Text>
\r
320 <!-- ************************************************************ -->
\r
321 <Text id="Delete1_MergeOption">
\r
324 <Text id="Delete1_Before"><![CDATA[
\r
325 ------------------------------
\r
332 ------------------------------
\r
333 ]]></Text><Text id="Delete1_After"><![CDATA[
\r
334 ------------------------------
\r
337 ------------------------------
\r
339 <Text id="Delete1_IsConflicted">No</Text>
\r
342 <!-- ************************************************************ -->
\r
343 <Text id="Delete2_MergeOption">
\r
346 <Text id="Delete2_Before"><![CDATA[
\r
347 ------------------------------
\r
357 ------------------------------
\r
358 ]]></Text><Text id="Delete2_After"><![CDATA[
\r
359 ------------------------------
\r
361 ------------------------------
\r
363 <Text id="Delete2_IsConflicted">No</Text>
\r
366 <!-- ************************************************************ -->
\r
367 <Text id="Error1_MergeOption">
\r
370 <Text id="Error1_Before"><![CDATA[
\r
371 ------------------------------
\r
375 ------------------------------
\r
376 ]]></Text><Text id="Error1_After"><![CDATA[
\r
377 ------------------------------
\r
379 ------------------------------
\r
381 <Text id="Error1_IsConflicted">No</Text>
\r
384 <!-- ************************************************************ -->
\r
385 <Text id="Error2_MergeOption">
\r
388 <Text id="Error2_Before"><![CDATA[
\r
389 ------------------------------
\r
394 ------------------------------
\r
395 ]]></Text><Text id="Error2_After"><![CDATA[
\r
396 ------------------------------
\r
398 ------------------------------
\r
400 <Text id="Error2_IsConflicted">No</Text>
\r
403 <!-- ************************************************************ -->
\r
404 <Text id="Error3_MergeOption">
\r
407 <Text id="Error3_Before"><![CDATA[
\r
408 ------------------------------
\r
412 ------------------------------
\r
413 ]]></Text><Text id="Error3_After"><![CDATA[
\r
414 ------------------------------
\r
418 ------------------------------
\r
420 <Text id="Error3_IsConflicted">No</Text>
\r
423 <!-- ************************************************************ -->
\r
424 <Text id="Error4_MergeOption">
\r
427 <Text id="Error4_Before"><![CDATA[
\r
428 ------------------------------
\r
432 ------------------------------
\r
433 ]]></Text><Text id="Error4_After"><![CDATA[
\r
434 ------------------------------
\r
438 ------------------------------
\r
440 <Text id="Error4_IsConflicted">No</Text>
\r
443 <!-- ************************************************************ -->
\r
444 <Text id="Error5_MergeOption">
\r
447 <Text id="Error5_Before"><![CDATA[
\r
448 ------------------------------
\r
453 ------------------------------
\r
454 ]]></Text><Text id="Error5_After"><![CDATA[
\r
455 ------------------------------
\r
457 ------------------------------
\r
459 <Text id="Error5_IsConflicted">No</Text>
\r