108 Local directory rename with conflicting file added in remote source directory

   109 and untracked in local target directory.

   110 

   111 BROKEN: the uncommitted file is overwritten; we should abort

   112 

   113   $ hg co -qC 1

   114   $ echo local > b/c

   115   $ hg merge 2

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

   117   (branch merge, don't forget to commit)

   118   $ hg st -C

   119   A b/c

   120     a/c

   121   ? a/d

   122   $ cat b/c

   123   baz

   124 

   125 Local directory rename with conflicting file added in remote source directory

   126 and committed in local target directory.

   127 

   128 BROKEN: the local file is overwritten; it should be merged

   129 

   130   $ hg co -qC 1

   131   $ echo local > b/c

   132   $ hg add b/c

   133   $ hg commit -qm 'new file in target directory'

   134   $ hg merge 2

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

   136   (branch merge, don't forget to commit)

   137   $ hg st -C

   138   A b/c

   139     a/c

   140   ? a/d

   141   $ cat b/c

   142   baz