Mercurial > hg
diff CONTRIBUTORS @ 6076:0ee885fea464
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 | c29efd272395 |
children |