log contrib/mergetools.hgrc @ 12801:cddea24aafed stable

age author description
Sat, 03 Jul 2010 02:15:25 +0200 Martin Geisler mergetools.hgrc: add vimdiff
Tue, 08 Jun 2010 11:58:09 -0500 Steve Borho mergetools: add configuration for Ultra Compare (issue2226)
Thu, 07 Jan 2010 22:19:05 -0600 Steve Borho extdiff: add labels, read diff arguments from [merge-tools]
Wed, 21 Apr 2010 12:02:51 -0500 David Champion give worst-case 'merge' merge-tool lowest priority
Mon, 15 Feb 2010 21:18:16 -0600 Steve Borho mergetools: improve configuration for several merge tools stable
Mon, 23 Mar 2009 10:48:45 +0100 Pascal Quantin merge tools: fix typo in Beyond Compare's 3 command line
Wed, 04 Feb 2009 22:12:55 +0100 Pascal Quantin Update Beyond Compare's configuration
Fri, 23 Jan 2009 23:39:28 +0100 Pascal Quantin Retrieve Beyond Compare's path from registry
Sat, 17 Jan 2009 18:51:40 +0100 Pascal Quantin Update win32 merge tools configuration
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