Mercurial > hg
diff mercurial/localrepo.py @ 24382:5859af34c5a6
localrepo: remove check for matcher object that's never None
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Tue, 30 Sep 2014 16:40:15 -0700 |
parents | 9347c15d8136 |
children | 521cecb4a3f1 |
line wrap: on
line diff
--- 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)'))