changeset 6639 | 6334569c8caa |
parent 6603 | 41eb20cc1c02 |
child 6647 | 602f7c1ab954 |
--- a/mercurial/localrepo.py Sun May 25 13:39:08 2008 -0700 +++ b/mercurial/localrepo.py Wed May 28 22:45:07 2008 +0200 @@ -787,7 +787,7 @@ update_dirstate = True if (not force and p2 != nullid and - (match.files() or match.anypats())): + (match and (match.files() or match.anypats()))): raise util.Abort(_('cannot partially commit a merge ' '(do not specify files or patterns)')) else: