| Wed, 27 Aug 2014 16:39:44 +0200 |
Mads Kiilerich |
contrib: add OS X p4merge to mergetools.hgrc
|
file |
diff |
annotate
|
| Sat, 12 Jul 2014 20:07:24 +0900 |
Yuya Nishihara |
mergetools: add --nofork option to gvimdiff.diffargs for extdiff
|
file |
diff |
annotate
|
| Thu, 29 May 2014 12:25:25 -0700 |
Pierre-Yves David |
mergetools.hgrc: add minimal configuration for editmerge
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 14:54:46 +0200 |
Mads Kiilerich |
contrib: remove mergetools.hgrc premerge=False for Beyond Compare and Araxis
|
file |
diff |
annotate
|
| Tue, 16 Apr 2013 13:55:38 +0200 |
ronvoe12249 |
mergetools: rename 'base' to 'merged' in meld
|
file |
diff |
annotate
|
| Thu, 21 Feb 2013 14:49:25 +0100 |
ronvoe12249 |
mergetools: avoid losing the merged version with meld
|
file |
diff |
annotate
|
| Fri, 15 Feb 2013 15:06:43 -0600 |
Kevin Bullock |
mergetools: refine vimdiff warning message
|
file |
diff |
annotate
|
| Fri, 15 Feb 2013 11:28:04 +0100 |
Pierre-Yves David |
mergetools: vimdiff issue a warning explaining how to abort
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 23:30:10 +0100 |
Mads Kiilerich |
docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
|
file |
diff |
annotate
|
| Thu, 02 Aug 2012 13:51:49 +0200 |
Pierre-Yves David |
mergetools.hgrc: set vimdiff to check=changed
stable
|
file |
diff |
annotate
|
| Tue, 08 Mar 2011 13:35:01 -0600 |
Steve Borho |
mergetools: add alternate registry keys for 32bit apps on 64bit O/S
stable
|
file |
diff |
annotate
|
| Sat, 03 Jul 2010 02:15:25 +0200 |
Martin Geisler |
mergetools.hgrc: add vimdiff
|
file |
diff |
annotate
|
| Tue, 08 Jun 2010 11:58:09 -0500 |
Steve Borho |
mergetools: add configuration for Ultra Compare (issue2226)
|
file |
diff |
annotate
|
| Thu, 07 Jan 2010 22:19:05 -0600 |
Steve Borho |
extdiff: add labels, read diff arguments from [merge-tools]
|
file |
diff |
annotate
|
| Wed, 21 Apr 2010 12:02:51 -0500 |
David Champion |
give worst-case 'merge' merge-tool lowest priority
|
file |
diff |
annotate
|
| Mon, 15 Feb 2010 21:18:16 -0600 |
Steve Borho |
mergetools: improve configuration for several merge tools
stable
|
file |
diff |
annotate
|
| Mon, 23 Mar 2009 10:48:45 +0100 |
Pascal Quantin |
merge tools: fix typo in Beyond Compare's 3 command line
|
file |
diff |
annotate
|
| Wed, 04 Feb 2009 22:12:55 +0100 |
Pascal Quantin |
Update Beyond Compare's configuration
|
file |
diff |
annotate
|
| Fri, 23 Jan 2009 23:39:28 +0100 |
Pascal Quantin |
Retrieve Beyond Compare's path from registry
|
file |
diff |
annotate
|
| Sat, 17 Jan 2009 18:51:40 +0100 |
Pascal Quantin |
Update win32 merge tools configuration
|
file |
diff |
annotate
|
| Sun, 16 Nov 2008 20:56:55 -0800 |
Brendan Cully |
mergetools: add pointer to the usual filemerge path
|
file |
diff |
annotate
|
| Wed, 16 Apr 2008 15:26:37 -0700 |
Neal Becker |
mergetools.hgrc patch
|
file |
diff |
annotate
|
| Wed, 06 Feb 2008 20:32:06 -0600 |
Steve Borho |
filemerge: add 'checkchanged' merge tool property
|
file |
diff |
annotate
|
| Mon, 04 Feb 2008 09:53:10 -0600 |
Matt Mackall |
mergetools: correct vim typo
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 22:27:53 -0600 |
Steve Borho |
filemerge: two fixes for kdiff3 example configuration
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
filemerge: add an example set of global settings for common merge tools
|
file |
diff |
annotate
|