equal
deleted
inserted
replaced
34 resolving manifests |
34 resolving manifests |
35 branchmerge: True, force: False, partial: False |
35 branchmerge: True, force: False, partial: False |
36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
37 preserving a for resolve of a |
37 preserving a for resolve of a |
38 a: versions differ -> m |
38 a: versions differ -> m |
39 picked tool 'internal:merge' for a (binary False symlink True) |
39 picked tool ':merge' for a (binary False symlink True) |
40 merging a |
40 merging a |
41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
42 warning: internal :merge cannot merge symlinks for a |
42 warning: internal :merge cannot merge symlinks for a |
43 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
43 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
67 resolving manifests |
67 resolving manifests |
68 branchmerge: True, force: False, partial: False |
68 branchmerge: True, force: False, partial: False |
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
70 preserving a for resolve of a |
70 preserving a for resolve of a |
71 a: versions differ -> m |
71 a: versions differ -> m |
72 picked tool 'internal:merge' for a (binary False symlink True) |
72 picked tool ':merge' for a (binary False symlink True) |
73 merging a |
73 merging a |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
75 warning: internal :merge cannot merge symlinks for a |
75 warning: internal :merge cannot merge symlinks for a |
76 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
76 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |