60 Symlink is other parent, executable is local: |
60 Symlink is other parent, executable is local: |
61 |
61 |
62 $ hg update -C 1 |
62 $ hg update -C 1 |
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64 |
64 |
65 $ hg merge --debug |
65 $ hg merge --debug --tool :union |
66 searching for copies back to rev 1 |
66 searching for copies back to rev 1 |
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 ':merge' for a (binary False symlink True) |
72 picked tool ':union' 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 :union 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 |
78 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
78 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
79 [1] |
79 [1] |
80 |
80 |