log contrib/mergetools.hgrc @ 6014:2f424fc4edb3

age author description
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