log contrib/mergetools.hgrc @ 7499:613f3c88a388

age author description
Sun, 16 Nov 2008 20:56:55 -0800 Brendan Cully mergetools: add pointer to the usual filemerge path
Wed, 16 Apr 2008 15:26:37 -0700 Neal Becker mergetools.hgrc patch
Wed, 06 Feb 2008 20:32:06 -0600 Steve Borho filemerge: add 'checkchanged' merge tool property
Mon, 04 Feb 2008 09:53:10 -0600 Matt Mackall mergetools: correct vim typo
Sun, 03 Feb 2008 22:27:53 -0600 Steve Borho filemerge: two fixes for kdiff3 example configuration
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: add an example set of global settings for common merge tools