Mercurial > hg-stable
changeset 27293:9e06e7fb037d
grammar: favor zero, one, two over ... or no
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Mon, 30 Nov 2015 19:30:16 +0000 |
| parents | 14a83e8e1b88 |
| children | 5aa2afb4f81a |
| files | mercurial/revset.py mercurial/templater.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revset.py Mon Nov 30 19:29:46 2015 +0000 +++ b/mercurial/revset.py Mon Nov 30 19:30:16 2015 +0000 @@ -1692,7 +1692,7 @@ from . import hg # avoid start-up nasties # i18n: "remote" is a keyword - l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) + l = getargs(x, 0, 2, _("remote takes zero, one, or two arguments")) q = '.' if len(l) > 0:
--- a/mercurial/templater.py Mon Nov 30 19:29:46 2015 +0000 +++ b/mercurial/templater.py Mon Nov 30 19:30:16 2015 +0000 @@ -336,7 +336,7 @@ specifying files to include or exclude.""" if len(args) > 2: # i18n: "diff" is a keyword - raise error.ParseError(_("diff expects one, two or no arguments")) + raise error.ParseError(_("diff expects zero, one, or two arguments")) def getpatterns(i): if i < len(args):