# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2012-07-31 22:20:10
# Node ID 2be2a070f294a2aa4868bb1167d09c8b09848cce
# Parent  7124f984dc8d70104e3b7bffdccf278a25344450

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 @@ helptable = sorted([
     (['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')),