comparison 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
comparison
equal deleted inserted replaced
13229:f3058dd05281 13234:0935ff767285
1878 else: 1878 else:
1879 if name == 'shortlist': 1879 if name == 'shortlist':
1880 msg = _('use "hg help" for the full list of commands ' 1880 msg = _('use "hg help" for the full list of commands '
1881 'or "hg -v" for details') 1881 'or "hg -v" for details')
1882 elif aliases: 1882 elif aliases:
1883 msg = _('use "hg -v help%s" to show aliases and ' 1883 msg = _('use "hg -v help%s" to show builtin aliases and '
1884 'global options') % (name and " " + name or "") 1884 'global options') % (name and " " + name or "")
1885 else: 1885 else:
1886 msg = _('use "hg -v help %s" to show global options') % name 1886 msg = _('use "hg -v help %s" to show global options') % name
1887 option_lists.append((msg, ())) 1887 option_lists.append((msg, ()))
1888 1888