108   $ hg co -qC 1

   108   $ hg co -qC 1

   109   $ echo target > b/c

   109   $ echo target > b/c

   110   $ hg merge 2

   110   $ hg merge 2

   111   b/c: untracked file differs

   111   b/c: untracked file differs

   112   abort: untracked files in working directory differ from files in requested revision

   112   abort: untracked files in working directory differ from files in requested revision

   114   $ cat b/c

   114   $ cat b/c

   115   target

   115   target

   116 but it should succeed if the content matches

   116 but it should succeed if the content matches

   117   $ hg cat -r 2 a/c > b/c

   117   $ hg cat -r 2 a/c > b/c

   118   $ hg merge 2

   118   $ hg merge 2