diff -r 82b82168d045 -r 5859af34c5a6 mercurial/localrepo.py --- a/mercurial/localrepo.py Wed Mar 18 11:42:09 2015 -0700 +++ b/mercurial/localrepo.py Tue Sep 30 16:40:15 2014 -0700 @@ -1315,8 +1315,7 @@ wctx = self[None] merge = len(wctx.parents()) > 1 - if (not force and merge and match and - (match.files() or match.anypats())): + if (not force and merge and (match.files() or match.anypats())): raise util.Abort(_('cannot partially commit a merge ' '(do not specify files or patterns)'))