$ hg init repo

  $ cd repo

  $ echo line 1 > foo

copy foo to bar and change both files

  $ hg cp foo bar

  $ echo line 2-1 >> foo

  $ echo line 2-2 >> bar

in another branch, change foo in a way that doesn't conflict with

the other changes

  $ hg up -qC 0

  $ echo line 0 > foo

  $ hg cat foo >> foo

  created new head

we get conflicts that shouldn't be there

  $ hg merge -P

  user:        test

  summary:     cp foo bar; change both

  $ hg merge --debug

    searching for copies back to rev 1

    unmatched files in other:

     bar

    all copies found (* = to merge, ! = divergent):

     bar -> foo *

    checking for directory renames

  resolving manifests

   overwrite None partial False

   foo: versions differ -> m

   foo: remote copied to bar -> m

  preserving foo for resolve of bar

  preserving foo for resolve of foo

  updating: foo 1/2 files (50.00%)

  picked tool 'internal:merge' for bar (binary False symlink False)

  merging foo and bar to bar

   premerge successful

  updating: foo 2/2 files (100.00%)

  picked tool 'internal:merge' for foo (binary False symlink False)

  merging foo

   premerge successful

  0 files updated, 2 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

contents of foo

  $ cat foo

  line 0

  line 1

  line 2-1

contents of bar

  $ cat bar

  line 0

  line 1

  line 2-2