OSDN Git Service

Version 5.91
[vbslib/main.git] / _src / Test / tools / T_Diff / Files / MergedAnswer_NoBase.txt
1 1\r
2 <<<<<<< Left.txt\r
3 Left\r
4 ||||||| Base.txt\r
5 =======\r
6 >>>>>>> Right.txt\r
7 2\r
8 <<<<<<< Left.txt\r
9 ||||||| Base.txt\r
10 =======\r
11 Right\r
12 >>>>>>> Right.txt\r
13 3\r
14 Both\r
15 4\r
16 <<<<<<< Left.txt\r
17 ||||||| Base.txt\r
18 =======\r
19 5\r
20 >>>>>>> Right.txt\r
21 6\r
22 <<<<<<< Left.txt\r
23 7\r
24 ||||||| Base.txt\r
25 =======\r
26 >>>>>>> Right.txt\r
27 8\r
28 10\r