equal
deleted
inserted
replaced
20 adding file changes |
20 adding file changes |
21 added 1 changesets with 1 changes to 1 files (+1 heads) |
21 added 1 changesets with 1 changes to 1 files (+1 heads) |
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
23 merge: warning: conflicts during merge |
23 merge: warning: conflicts during merge |
24 resolving manifests |
24 resolving manifests |
25 overwrite None branchmerge True partial False |
25 overwrite None partial False |
26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 |
26 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
27 test.txt: versions differ -> m |
27 test.txt: versions differ -> m |
28 merging test.txt |
28 merging test.txt |
29 my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
29 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
30 merging test.txt failed! |
30 merging test.txt failed! |
31 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
31 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
32 There are unresolved merges, you can redo the full merge using: |
32 There are unresolved merges, you can redo the full merge using: |
33 hg update -C 3 |
33 hg update -C 3 |
34 hg merge 4 |
34 hg merge 4 |