Mercurial > hg

diff doc/hg.1.txt @ 6076:0ee885fea464

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: more backwards compatible behavior for ui.merge if ui.merge matches a tool in [merge-tools], it is used as the default tool selection but may be rejected by binary or gui or other checks. If ui.merge does not match a merge tool, it is used unconditionally.
author Steve Borho <steve@borho.org>
date Wed, 06 Feb 2008 20:44:25 -0600
parents ba40e267762b
children ee5313bc3c0c 9e3bddb5fae2
line wrap: on
line diff