diff mercurial/dispatch.py @ 12070:fddacca3202e

Merge with stable

--- a/mercurial/dispatch.py	Sat Aug 28 23:57:39 2010 +0200
+++ b/mercurial/dispatch.py	Sun Aug 29 22:55:37 2010 +0200
@@ -463,9 +463,9 @@
     cmd, func, args, options, cmdoptions = _parse(lui, args)
 
     if options["config"]:
-        raise util.Abort(_("Option --config may not be abbreviated!"))
+        raise util.Abort(_("option --config may not be abbreviated!"))
     if options["cwd"]:
-        raise util.Abort(_("Option --cwd may not be abbreviated!"))
+        raise util.Abort(_("option --cwd may not be abbreviated!"))
     if options["repository"]:
         raise util.Abort(_(
             "Option -R has to be separated from other options (e.g. not -qR) "