equal
deleted
inserted
replaced
25 overwrite None branchmerge True partial False |
25 overwrite None branchmerge True partial False |
26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 |
26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 |
27 test.txt: versions differ -> m |
27 test.txt: versions differ -> m |
28 merging test.txt |
28 merging test.txt |
29 resolving test.txt |
29 resolving test.txt |
30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |
30 my test.txt@451c744aabcc other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
31 merging test.txt failed! |
31 merging test.txt failed! |
32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
33 There are unresolved merges, you can redo the full merge using: |
33 There are unresolved merges, you can redo the full merge using: |
34 hg update -C 3 |
34 hg update -C 3 |
35 hg merge 4 |
35 hg merge 4 |