# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2014-10-29 05:43:59
# Node ID 521cecb4a3f16e508ebc645879a0feee05dccc32
# Parent  5859af34c5a644b594e3e9d87e703b4b680542b6

localrepo: simplify by using match.always() method

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1315,7 +1315,7 @@ class localrepository(object):
             wctx = self[None]
             merge = len(wctx.parents()) > 1
 
-            if (not force and merge and (match.files() or match.anypats())):
+            if not force and merge and not match.always():
                 raise util.Abort(_('cannot partially commit a merge '
                                    '(do not specify files or patterns)'))