Steve Borho <steve@borho.org> [Wed, 06 Feb 2008 20:44:25 -0600] rev 6076
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.
Steve Borho <steve@borho.org> [Wed, 06 Feb 2008 20:32:06 -0600] rev 6075
filemerge: add 'checkchanged' merge tool property
Matt Mackall <mpm@selenic.com> [Mon, 11 Feb 2008 16:13:43 -0600] rev 6074
ignore: split up huge patterns
Some versions of Python silently mishandle large regexes, so split
them up at a conservative 20k.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 10 Feb 2008 13:19:24 +0100] rev 6073
Use chmod 0770 and g+s instead of 02770 which does't work on Solaris 8.