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 32312 0d6b3572ad92
parent 32292 0ad0d26ff703
child 32314 9f35c7836f60 
--- a/mercurial/localrepo.py	Tue May 16 21:17:40 2017 -0700
+++ b/mercurial/localrepo.py	Wed May 17 09:43:50 2017 -0700
@@ -1575,7 +1575,7 @@
             wctx = self[None]
             merge = len(wctx.parents()) > 1
 
-            if not force and merge and match.ispartial():
+            if not force and merge and not match.always():
                 raise error.Abort(_('cannot partially commit a merge '
                                    '(do not specify files or patterns)'))
Mercurial