diff mercurial/commands.py @ 13234:0935ff767285

merge with stable
author Martin Geisler <mg@aragost.com>
date Wed, 05 Jan 2011 15:56:03 +0100
parents 1aea66b71f4f 827a1cc127bf
children 6bf39d88c857
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Dec 31 17:09:38 2010 -0600
+++ b/mercurial/commands.py	Wed Jan 05 15:56:03 2011 +0100
@@ -1880,7 +1880,7 @@
                 msg = _('use "hg help" for the full list of commands '
                         'or "hg -v" for details')
             elif aliases:
-                msg = _('use "hg -v help%s" to show aliases and '
+                msg = _('use "hg -v help%s" to show builtin aliases and '
                         'global options') % (name and " " + name or "")
             else:
                 msg = _('use "hg -v help %s" to show global options') % name