Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/help.py
branchstable
changeset 17323 2be2a070f294
parent 17322 7124f984dc8d
child 17837 b623e323c561 
--- a/mercurial/help.py	Wed Aug 01 14:59:15 2012 +0200
+++ b/mercurial/help.py	Wed Aug 01 00:20:10 2012 +0200
@@ -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')),
hg-stable