changeset 12771 | c77f6276c9e7 |
parent 12401 | 4cdaf1adafc8 |
child 12818 | 019b8e1e0402 |
--- a/mercurial/help.py Wed Oct 20 10:13:04 2010 +0200 +++ b/mercurial/help.py Wed Oct 20 16:54:34 2010 +0200 @@ -94,6 +94,7 @@ loaddoc('multirevs')), (['revsets'], _("Specifying Revision Sets"), loaddoc('revsets')), (['diffs'], _('Diff Formats'), loaddoc('diffs')), + (['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')), (['templating', 'templates'], _('Template Usage'), loaddoc('templates')), (['urls'], _('URL Paths'), loaddoc('urls')),