Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 23479:406dfc63a1ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 05 Dec 2014 12:10:56 -0600
parents 39a12719ec65 30b602168c3b
children 208ec8ca7c79
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Dec 03 11:02:52 2014 -0800
+++ b/mercurial/merge.py	Fri Dec 05 12:10:56 2014 -0600
@@ -298,8 +298,7 @@
         return r
 
 def _checkunknownfile(repo, wctx, mctx, f):
-    return (not repo.dirstate._ignore(f)
-        and os.path.isfile(repo.wjoin(f))
+    return (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]))