equal
deleted
inserted
replaced
295 resolving manifests |
295 resolving manifests |
296 branchmerge: True, force: False, partial: False |
296 branchmerge: True, force: False, partial: False |
297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
298 preserving t for resolve of t |
298 preserving t for resolve of t |
299 t: versions differ -> m |
299 t: versions differ -> m |
300 picked tool 'internal:merge' for t (binary False symlink False) |
300 picked tool ':merge' for t (binary False symlink False) |
301 merging t |
301 merging t |
302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
303 warning: conflicts during merge. |
303 warning: conflicts during merge. |
304 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
304 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
305 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
305 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |