--- a/mercurial/merge.py	Thu Feb 11 17:04:33 2016 -0800
+++ b/mercurial/merge.py	Thu Feb 11 17:23:10 2016 -0800
@@ -598,8 +598,8 @@
 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
     if f2 is None:
         f2 = f
-    return (repo.wvfs.isfileorlink(f)
-        and repo.wvfs.audit.check(f)
+    return (repo.wvfs.audit.check(f)
+        and repo.wvfs.isfileorlink(f)
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f2].cmp(wctx[f]))