diff -r e08e0367ba15 -r 69f3e9ac7c56 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon May 12 11:37:07 2008 -0500
+++ b/mercurial/localrepo.py	Mon May 12 11:37:07 2008 -0500
@@ -786,7 +786,7 @@
                 update_dirstate = True
 
                 if (not force and p2 != nullid and
-                    (files or match != util.always)):
+                    (match.files() or match.anypats())):
                     raise util.Abort(_('cannot partially commit a merge '
                                        '(do not specify files or patterns)'))
             else: