diff -r 14a83e8e1b88 -r 9e06e7fb037d mercurial/templater.py
--- 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):