equal
deleted
inserted
replaced
79 added 1 changesets with 1 changes to 1 files (+1 heads) |
79 added 1 changesets with 1 changes to 1 files (+1 heads) |
80 (run 'hg heads' to see heads, 'hg merge' to merge) |
80 (run 'hg heads' to see heads, 'hg merge' to merge) |
81 $ hg merge --debug |
81 $ hg merge --debug |
82 searching for copies back to rev 1 |
82 searching for copies back to rev 1 |
83 resolving manifests |
83 resolving manifests |
84 overwrite: False, partial: False |
84 branchmerge: True, force: False, partial: False |
85 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
85 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
86 test.txt: versions differ -> m |
86 test.txt: versions differ -> m |
87 preserving test.txt for resolve of test.txt |
87 preserving test.txt for resolve of test.txt |
88 updating: test.txt 1/1 files (100.00%) |
88 updating: test.txt 1/1 files (100.00%) |
89 picked tool 'internal:merge' for test.txt (binary False symlink False) |
89 picked tool 'internal:merge' for test.txt (binary False symlink False) |