Mercurial > hg-stable

changeset 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 cf1e15f91c90
children 2cbbd4622ab0
files mercurial/help.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/help.py	Thu Jan 12 21:06:55 2017 +0900
+++ b/mercurial/help.py	Fri Jan 13 21:21:02 2017 -0800
@@ -214,7 +214,8 @@
       _('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')),