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 starting 4 threads for background file closing (?) |
88 preserving test.txt for resolve of test.txt |
88 preserving test.txt for resolve of test.txt |
89 test.txt: versions differ -> m (premerge) |
89 test.txt: versions differ -> m |
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) |
|
94 picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
93 picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
95 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
94 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
96 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') |
95 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') |
97 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
96 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
98 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
97 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |