facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-07 14:10:42 +03:00
Code Issues Projects Releases Wiki Activity

help: make "mergetool" an alias for "merge-tools"

Browse Source 
I've probably typed `hg help mergetool` dozens of times. I'm tired
of it not working.
This commit is contained in:
Gregory Szorc 2017-01-13 21:21:02 -08:00
parent 1146ca6217
commit 550169e48e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/help.py
View File

@ -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')),