equal
deleted
inserted
replaced
69 $ hg --debug merge 3 |
69 $ hg --debug merge 3 |
70 searching for copies back to rev 1 |
70 searching for copies back to rev 1 |
71 resolving manifests |
71 resolving manifests |
72 branchmerge: True, force: False, partial: False |
72 branchmerge: True, force: False, partial: False |
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
|
74 preserving bar for resolve of bar |
74 bar: versions differ -> m |
75 bar: versions differ -> m |
75 preserving bar for resolve of bar |
|
76 updating: bar 1/1 files (100.00%) |
76 updating: bar 1/1 files (100.00%) |
77 picked tool 'internal:merge' for bar (binary False symlink False) |
77 picked tool 'internal:merge' for bar (binary False symlink False) |
78 merging bar |
78 merging bar |
79 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
79 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
80 premerge successful |
80 premerge successful |
156 $ hg --debug merge 3 |
156 $ hg --debug merge 3 |
157 searching for copies back to rev 1 |
157 searching for copies back to rev 1 |
158 resolving manifests |
158 resolving manifests |
159 branchmerge: True, force: False, partial: False |
159 branchmerge: True, force: False, partial: False |
160 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
160 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
|
161 preserving bar for resolve of bar |
161 bar: versions differ -> m |
162 bar: versions differ -> m |
162 preserving bar for resolve of bar |
|
163 updating: bar 1/1 files (100.00%) |
163 updating: bar 1/1 files (100.00%) |
164 picked tool 'internal:merge' for bar (binary False symlink False) |
164 picked tool 'internal:merge' for bar (binary False symlink False) |
165 merging bar |
165 merging bar |
166 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
166 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
167 premerge successful |
167 premerge successful |