diff -r 0b3689a08df5 -r 113681bbef9e mercurial/merge.py
--- a/mercurial/merge.py	Thu Apr 04 13:45:21 2013 -0700
+++ b/mercurial/merge.py	Wed May 08 14:11:01 2013 -0700
@@ -95,6 +95,7 @@
 def _checkunknownfile(repo, wctx, mctx, f):
     return (not repo.dirstate._ignore(f)
         and os.path.isfile(repo.wjoin(f))
+        and repo.wopener.audit.check(f)
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f].cmp(wctx[f]))