100   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   101   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   102   [1]

   103 

   104   $ tellmeabout a

   105   a is an executable file with content:

   106   a

   107 

   108   $ hg update -C 1

   109   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   110 

   111   $ hg merge --debug --tool :merge-local

   112     searching for copies back to rev 1

   113   resolving manifests

   114    branchmerge: True, force: False, partial: False

   115    ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f

   116    preserving a for resolve of a

   117    a: versions differ -> m (premerge)

   118   picked tool ':merge-local' for a (binary False symlink True)

   119   merging a

   120   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da

   121   warning: :merge-local cannot merge symlinks for a

   122   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   123   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   124   [1]

   125 

   126   $ tellmeabout a

   127   a is an executable file with content:

   128   a

   129 

   130   $ hg update -C 1

   131   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   132 

   133   $ hg merge --debug --tool :merge-other

   134     searching for copies back to rev 1

   135   resolving manifests

   136    branchmerge: True, force: False, partial: False

   137    ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f

   138    preserving a for resolve of a

   139    a: versions differ -> m (premerge)

   140   picked tool ':merge-other' for a (binary False symlink True)

   141   merging a

   142   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da

   143   warning: :merge-other cannot merge symlinks for a