equal
deleted
inserted
replaced
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
23 warning: conflicts during merge. |
23 warning: conflicts during merge. |
24 resolving manifests |
24 resolving manifests |
25 overwrite None partial False |
25 overwrite None partial False |
26 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
26 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
|
27 searching for copies back to rev 1 |
27 test.txt: versions differ -> m |
28 test.txt: versions differ -> m |
28 merging test.txt |
29 merging test.txt |
29 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
30 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
30 merging test.txt failed! |
31 merging test.txt failed! |
31 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 |