Mercurial > hg

changeset 17323:2be2a070f294 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: add 'mergetools' alias for the 'merge-tools' help topic The '-' in 'merge-tools' is surprising but necessary in the configuration. Let's help those who forget that and are looking for help.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 01 Aug 2012 00:20:10 +0200
parents 7124f984dc8d
children 9f94358f9f93
files mercurial/help.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/help.py	Wed Aug 01 14:59:15 2012 +0200
+++ b/mercurial/help.py	Wed Aug 01 00:20:10 2012 +0200
@@ -150,7 +150,7 @@
     (['revsets', 'revset'], _("Specifying Revision Sets"), loaddoc('revsets')),
     (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
     (['diffs'], _('Diff Formats'), loaddoc('diffs')),
-    (['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')),
+    (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
     (['templating', 'templates', 'template', 'style'], _('Template Usage'),
      loaddoc('templates')),
     (['urls'], _('URL Paths'), loaddoc('urls')),