git-commit-vandalism/mergetools
Tim Henigan 284a126c3e mergetools: add a plug-in to support DeltaWalker
DeltaWalker is a non-free tool popular among some users.  Add a
plug-in to support it from difftool and mergetool.

Note that the $(pwd)/ in front of $MERGED should not be necessary.
However without it, DeltaWalker crashes with a JRE exception.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-05 09:31:47 -08:00
..
araxis
bc3 mergetools: use the correct tool for Beyond Compare 3 on Windows 2011-10-15 20:13:55 -07:00
defaults
deltawalker mergetools: add a plug-in to support DeltaWalker 2012-03-05 09:31:47 -08:00
diffuse
ecmerge
emerge
kdiff3
kompare
meld mergetools/meld: Use --help output to detect --output support 2012-02-10 14:53:18 -08:00
opendiff
p4merge
tkdiff
tortoisemerge
vim
xxdiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00