equal
deleted
inserted
replaced
22 test.txt versions differ, resolve |
22 test.txt versions differ, resolve |
23 merging test.txt |
23 merging test.txt |
24 resolving test.txt |
24 resolving test.txt |
25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |
25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |
26 merging test.txt failed! |
26 merging test.txt failed! |
|
27 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
28 (branch merge, don't forget to commit) |
27 one |
29 one |
28 <<<<<<< |
30 <<<<<<< |
29 two-point-five |
31 two-point-five |
30 ======= |
32 ======= |
31 two-point-one |
33 two-point-one |