# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1335550689 18000
# Node ID 11212babc690f956ff54d75450ba0bc123a199d9
# Parent  95698ee291814abc4d23e614b4eedd8dfe07ee2d
merge: check for untracked files more precisely (issue3400)

This fixes the regression, but still leaves the long-standing issue
that merge doesn't cope with trying to merge files and directories.

diff -r 95698ee29181 -r 11212babc690 mercurial/merge.py
--- a/mercurial/merge.py	Fri Apr 27 13:07:29 2012 -0500
+++ b/mercurial/merge.py	Fri Apr 27 13:18:09 2012 -0500
@@ -83,7 +83,7 @@
 
 def _checkunknownfile(repo, wctx, mctx, f):
     return (not repo.dirstate._ignore(f)
-        and os.path.exists(repo.wjoin(f))
+        and os.path.isfile(repo.wjoin(f))
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f].cmp(wctx[f]))