[PATCH 3 of 7 STABLE] merge: check whether existing directory is related to tracked files or not

[Matt Mackall]

On Tue, 2013-05-07 at 05:35 +0900, FUJIWARA Katsunori wrote:
> #  $ mkdir c
> +  $ hg update -q 3
> +  c: untracked file differs
> +  abort: untracked files in working directory differ from files in requested revision

I'm not sure this is the correct result, given that the directory is
empty. Mercurial is happy to delete/ignore empty directories in other
cases.

-- 
Mathematics is the supreme nostalgia of our time.