# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2017-01-14 05:21:02
# Node ID 98bfce9bd5e53e88d1c94af5f24b0e91795e18a3
# Parent  cf1e15f91c90ec894c283caf6e7b562ccdc73c98

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.

diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -214,7 +214,8 @@ helptable = sorted([
       _('Specifying Revisions'), loaddoc('revisions')),
     (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
     (['diffs'], _('Diff Formats'), loaddoc('diffs')),
-    (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
+    (['merge-tools', 'mergetools', 'mergetool'], _('Merge Tools'),
+     loaddoc('merge-tools')),
     (['templating', 'templates', 'template', 'style'], _('Template Usage'),
      loaddoc('templates')),
     (['urls'], _('URL Paths'), loaddoc('urls')),