equal
deleted
inserted
replaced
17 adding changesets |
17 adding changesets |
18 adding manifests |
18 adding manifests |
19 adding file changes |
19 adding file changes |
20 added 1 changesets with 1 changes to 1 files (+1 heads) |
20 added 1 changesets with 1 changes to 1 files (+1 heads) |
21 (run 'hg heads' to see heads, 'hg merge' to merge) |
21 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
22 searching for copies back to rev 1 |
22 resolving manifests |
23 resolving manifests |
23 overwrite None partial False |
24 overwrite None partial False |
24 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
25 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
25 searching for copies back to rev 1 |
|
26 test.txt: versions differ -> m |
26 test.txt: versions differ -> m |
27 preserving test.txt for resolve of test.txt |
27 preserving test.txt for resolve of test.txt |
28 picked tool 'internal:merge' for test.txt (binary False symlink False) |
28 picked tool 'internal:merge' for test.txt (binary False symlink False) |
29 merging test.txt |
29 merging test.txt |
30 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 |