##// END OF EJS Templates
merge with stable
Martin Geisler -
r16569:d7c9976b merge default
parent child Browse files
Show More
@@ -3941,6 +3941,9 b' def log(ui, repo, *pats, **opts):'
3941 See :hg:`help revisions` and :hg:`help revsets` for more about
3941 See :hg:`help revisions` and :hg:`help revsets` for more about
3942 specifying revisions.
3942 specifying revisions.
3943
3943
3944 See :hg:`help templates` for more about pre-packaged styles and
3945 specifying custom templates.
3946
3944 Returns 0 on success.
3947 Returns 0 on success.
3945 """
3948 """
3946
3949
@@ -64,7 +64,7 b' helptable = sorted(['
64 (['fileset', 'filesets'], _("Specifying File Sets"), loaddoc('filesets')),
64 (['fileset', 'filesets'], _("Specifying File Sets"), loaddoc('filesets')),
65 (['diffs'], _('Diff Formats'), loaddoc('diffs')),
65 (['diffs'], _('Diff Formats'), loaddoc('diffs')),
66 (['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')),
66 (['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')),
67 (['templating', 'templates'], _('Template Usage'),
67 (['templating', 'templates', 'template', 'style'], _('Template Usage'),
68 loaddoc('templates')),
68 loaddoc('templates')),
69 (['urls'], _('URL Paths'), loaddoc('urls')),
69 (['urls'], _('URL Paths'), loaddoc('urls')),
70 (["extensions"], _("Using Additional Features"), extshelp),
70 (["extensions"], _("Using Additional Features"), extshelp),
General Comments 0
You need to be logged in to leave comments. Login now