Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 24383 521cecb4a3f1
parent 24382 5859af34c5a6
child 24386 d6ac30f4edef 
--- a/mercurial/localrepo.py	Tue Sep 30 16:40:15 2014 -0700
+++ b/mercurial/localrepo.py	Tue Oct 28 22:43:59 2014 -0700
@@ -1315,7 +1315,7 @@
             wctx = self[None]
             merge = len(wctx.parents()) > 1
 
-            if (not force and merge and (match.files() or match.anypats())):
+            if not force and merge and not match.always():
                 raise util.Abort(_('cannot partially commit a merge '
                                    '(do not specify files or patterns)'))
Mercurial