equal
deleted
inserted
replaced
279 merging subrepo t |
279 merging subrepo t |
280 searching for copies back to rev 2 |
280 searching for copies back to rev 2 |
281 resolving manifests |
281 resolving manifests |
282 branchmerge: True, force: False, partial: False |
282 branchmerge: True, force: False, partial: False |
283 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
283 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
284 preserving t for resolve of t |
284 t: versions differ -> m |
285 t: versions differ -> m |
285 preserving t for resolve of t |
|
286 updating: t 1/1 files (100.00%) |
286 updating: t 1/1 files (100.00%) |
287 picked tool 'internal:merge' for t (binary False symlink False) |
287 picked tool 'internal:merge' for t (binary False symlink False) |
288 merging t |
288 merging t |
289 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
289 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
290 warning: conflicts during merge. |
290 warning: conflicts during merge. |