Mercurial > public > mercurial-scm > hg

diff mercurial/help.py @ 12771:c77f6276c9e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: help topic for merge tools I have made a help topic for merge tools. The text in the topic is based on the http://mercurial.selenic.com/wiki/MergeProgram page from the wiki, along with some extra information on the internal merge tools.
author Erik Zielke <ez@aragost.com>
date Wed, 20 Oct 2010 16:54:34 +0200
parents 4cdaf1adafc8
children 019b8e1e0402
line wrap: on
line diff
--- 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')),