[PATCH 5 of 5] help: add 'mergetools' alias for the 'merge-tools' help topic

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1343773210 -7200
# Branch stable
# Node ID 2a77b587cdd32b490338d4b172c765716f8e5cd4
# Parent  866aa792fd62193e76f0f71b4bebb743798c7bb5
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.

diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -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')),