Mercurial > hg

comparison mercurial/url.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 614f0d8724ab
children 9d6adddc8eea
comparison
equal deleted inserted replaced
12770:614f0d8724ab 12771:c77f6276c9e7