equal
deleted
inserted
replaced
82 $ hg merge --debug |
82 $ hg merge --debug |
83 searching for copies back to rev 1 |
83 searching for copies back to rev 1 |
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 preserving test.txt for resolve of test.txt |
87 test.txt: versions differ -> m |
88 test.txt: versions differ -> m |
88 preserving test.txt for resolve of test.txt |
|
89 updating: test.txt 1/1 files (100.00%) |
89 updating: test.txt 1/1 files (100.00%) |
90 picked tool 'internal:merge' for test.txt (binary False symlink False) |
90 picked tool 'internal:merge' for test.txt (binary False symlink 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 warning: conflicts during merge. |
93 warning: conflicts during merge. |