Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/help.py @ 30812:98bfce9bd5e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: make "mergetool" an alias for "merge-tools" I've probably typed `hg help mergetool` dozens of times. I'm tired of it not working.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 13 Jan 2017 21:21:02 -0800
parents e520f0f4b1cf
children 2a0c8e3636b0
comparison
equal deleted inserted replaced
30811:cf1e15f91c90 30812:98bfce9bd5e5
212 loaddoc('environment')), 212 loaddoc('environment')),
213 (['revisions', 'revs', 'revsets', 'revset', 'multirevs', 'mrevs'], 213 (['revisions', 'revs', 'revsets', 'revset', 'multirevs', 'mrevs'],
214 _('Specifying Revisions'), loaddoc('revisions')), 214 _('Specifying Revisions'), loaddoc('revisions')),
215 (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')), 215 (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
216 (['diffs'], _('Diff Formats'), loaddoc('diffs')), 216 (['diffs'], _('Diff Formats'), loaddoc('diffs')),
217 (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')), 217 (['merge-tools', 'mergetools', 'mergetool'], _('Merge Tools'),
218 loaddoc('merge-tools')),
218 (['templating', 'templates', 'template', 'style'], _('Template Usage'), 219 (['templating', 'templates', 'template', 'style'], _('Template Usage'),
219 loaddoc('templates')), 220 loaddoc('templates')),
220 (['urls'], _('URL Paths'), loaddoc('urls')), 221 (['urls'], _('URL Paths'), loaddoc('urls')),
221 (["extensions"], _("Using Additional Features"), extshelp), 222 (["extensions"], _("Using Additional Features"), extshelp),
222 (["subrepos", "subrepo"], _("Subrepositories"), loaddoc('subrepos')), 223 (["subrepos", "subrepo"], _("Subrepositories"), loaddoc('subrepos')),