changeset 25114 | d1d69ca78883 |
parent 25021 | 9a74b9919581 |
child 25119 | 49c583ca48c4 |
--- a/mercurial/localrepo.py Sat May 16 11:28:04 2015 -0700 +++ b/mercurial/localrepo.py Fri May 15 15:43:26 2015 -0700 @@ -1377,7 +1377,7 @@ wctx = self[None] merge = len(wctx.parents()) > 1 - if not force and merge and not match.always(): + if not force and merge and match.ispartial(): raise util.Abort(_('cannot partially commit a merge ' '(do not specify files or patterns)'))