equal
deleted
inserted
replaced
82 (run 'hg heads' to see heads, 'hg merge' to merge) |
82 (run 'hg heads' to see heads, 'hg merge' to merge) |
83 $ hg merge --debug |
83 $ hg merge --debug |
84 resolving manifests |
84 resolving manifests |
85 branchmerge: True, force: False, partial: False |
85 branchmerge: True, force: False, partial: False |
86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
|
87 starting 4 threads for background file closing (?) |
87 preserving test.txt for resolve of test.txt |
88 preserving test.txt for resolve of test.txt |
88 starting 4 threads for background file closing (?) |
|
89 test.txt: versions differ -> m (premerge) |
89 test.txt: versions differ -> m (premerge) |
90 picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
90 picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
91 merging test.txt |
91 merging test.txt |
92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
93 test.txt: versions differ -> m (merge) |
93 test.txt: versions differ -> m (merge) |