Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
12770:614f0d8724ab 12771:c77f6276c9e7
92 loaddoc('revisions')), 92 loaddoc('revisions')),
93 (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), 93 (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
94 loaddoc('multirevs')), 94 loaddoc('multirevs')),
95 (['revsets'], _("Specifying Revision Sets"), loaddoc('revsets')), 95 (['revsets'], _("Specifying Revision Sets"), loaddoc('revsets')),
96 (['diffs'], _('Diff Formats'), loaddoc('diffs')), 96 (['diffs'], _('Diff Formats'), loaddoc('diffs')),
97 (['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')),
97 (['templating', 'templates'], _('Template Usage'), 98 (['templating', 'templates'], _('Template Usage'),
98 loaddoc('templates')), 99 loaddoc('templates')),
99 (['urls'], _('URL Paths'), loaddoc('urls')), 100 (['urls'], _('URL Paths'), loaddoc('urls')),
100 (["extensions"], _("Using additional features"), extshelp), 101 (["extensions"], _("Using additional features"), extshelp),
101 (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')), 102 (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),