diff -r ca8ada499529 -r 6a6e78f84cc6 mercurial/merge.py
--- a/mercurial/merge.py	Sat Dec 26 15:18:16 2015 +0900
+++ b/mercurial/merge.py	Mon Dec 28 22:51:37 2015 -0800
@@ -404,7 +404,7 @@
 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
     if f2 is None:
         f2 = f
-    return (os.path.isfile(repo.wjoin(f))
+    return (repo.wvfs.isfileorlink(f)
         and repo.wvfs.audit.check(f)
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f2].cmp(wctx[f]))