148 searching for copies back to rev 1 |
148 searching for copies back to rev 1 |
149 resolving manifests |
149 resolving manifests |
150 branchmerge: True, force: True, partial: False |
150 branchmerge: True, force: True, partial: False |
151 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
151 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
152 e: remote is newer -> g |
152 e: remote is newer -> g |
|
153 getting e |
153 updating: e 1/1 files (100.00%) |
154 updating: e 1/1 files (100.00%) |
154 getting e |
|
155 e |
155 e |
156 grafting revision 4 |
156 grafting revision 4 |
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: True, partial: False |
159 branchmerge: True, force: True, partial: False |
160 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
160 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
161 d: remote is newer -> g |
161 d: remote is newer -> g |
162 e: versions differ -> m |
162 e: versions differ -> m |
163 preserving e for resolve of e |
163 preserving e for resolve of e |
|
164 getting d |
164 updating: d 1/2 files (50.00%) |
165 updating: d 1/2 files (50.00%) |
165 getting d |
|
166 updating: e 2/2 files (100.00%) |
166 updating: e 2/2 files (100.00%) |
167 picked tool 'internal:merge' for e (binary False symlink False) |
167 picked tool 'internal:merge' for e (binary False symlink False) |
168 merging e |
168 merging e |
169 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
169 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
170 warning: conflicts during merge. |
170 warning: conflicts during merge. |