# HG changeset patch
# User Martin von Zweigbergk <martinvonz@gmail.com>
# Date 1412120415 25200
# Node ID 5859af34c5a644b594e3e9d87e703b4b680542b6
# Parent  82b82168d0451f1284578000c536750f92381342
localrepo: remove check for matcher object that's never None

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)'))