tests/test-merge-types.t

21265:232de244ab6f

  $ tellmeabout a
  a is a symlink:
  a -> symlink
  $ hg resolve a --tool internal:other
  $ tellmeabout a
  a is an executable file with content:
  a
  $ hg st
  M a

21266:19d6fec60b81

  $ tellmeabout a
  a is a symlink:
  a -> symlink
  $ hg resolve a --tool internal:other
  no unresolved files; you may continue your unfinished operation
  $ tellmeabout a
  a is an executable file with content:
  a
  $ hg st
  M a