Commit Graph

15 Commits

Author SHA1 Message Date
Martin Geisler
fabfcd3971 mergetools.hgrc: add vimdiff
Imported from deb_specific__mergetools patch in Debians patch queue:

  http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
2010-07-03 02:15:25 +02:00
Steve Borho
74a14c2364 mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
2010-06-08 11:58:09 -05:00
Steve Borho
c76d6b8145 extdiff: add labels, read diff arguments from [merge-tools]
hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:

[extdiff]
kdiff3 =
meld =
2010-01-07 22:19:05 -06:00
David Champion
8d642796c6 give worst-case 'merge' merge-tool lowest priority
Another tool had -10 already.  Since 'merge' is clearly a worst-case
tool (internal), lowering to -100 ensures there's plenty of room for
slightly better cases.
2010-04-21 12:02:51 -05:00
Steve Borho
a6d934b6af mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
2010-02-15 21:18:16 -06:00
Pascal Quantin
79f2ac527a merge tools: fix typo in Beyond Compare's 3 command line
Fix a typo error preventing 'base' to be displayed properly.
2009-03-23 10:48:45 +01:00
Pascal Quantin
29992cd051 Update Beyond Compare's configuration
If there is already a Beyond Compare's instance running when performing a merge
from Mercurial, BCompare.exe will exit immediately and the merge will fail.
Use the /solo switch to make it always wait (it will open each comparison in
it's own window instead of in tabs)
2009-02-04 22:12:55 +01:00
Pascal Quantin
1243276d6c Retrieve Beyond Compare's path from registry
Switch from a hardcoded path to registry key to find Beyond Compare's
executable. Calling BCompare.exe works fine with version 3.0.14.
2009-01-23 23:39:28 +01:00
Pascal Quantin
96bb56bfd5 Update win32 merge tools configuration
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.
2009-01-17 18:51:40 +01:00
Brendan Cully
f8be17617f mergetools: add pointer to the usual filemerge path 2008-11-16 20:56:55 -08:00
Neal Becker
23032b2d99 mergetools.hgrc patch 2008-04-16 15:26:37 -07:00
Steve Borho
a42f97b40e filemerge: add 'checkchanged' merge tool property 2008-02-06 20:32:06 -06:00
Matt Mackall
0e0a073578 mergetools: correct vim typo 2008-02-04 09:53:10 -06:00
Steve Borho
351fbe22a2 filemerge: two fixes for kdiff3 example configuration 2008-02-03 22:27:53 -06:00
Matt Mackall
176caad743 filemerge: add an example set of global settings for common merge tools 2008-02-03 19:29:05 -06:00