Michael Schindler 47eb4c6890 mergetools/kdiff3: make kdiff3 work on Windows too ... The native kdiff3 mergetool is not found by git mergetool on Windows. The message "The merge tool kdiff3 is not available as 'kdiff3'" is displayed. Just like we translate the name of the binary and look for it on the search path for WinMerge, do the same for kdiff3 to find it. Signed-off-by: Michael Schindler michael@compressconsult.com Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-06-08 10:26:16 +09:00
..
araxis	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
bc	mergetools/bc: add `bc4` to the alias list for Beyond Compare	2020-11-11 13:00:10 -08:00
codecompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
deltawalker	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
diffmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
diffuse	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
ecmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
emerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
examdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
guiffy	mergetools: add support for guiffy	2018-04-06 08:11:39 +09:00
gvimdiff	…
kdiff3	mergetools/kdiff3: make kdiff3 work on Windows too	2021-06-08 10:26:16 +09:00
kompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
meld	mergetool: allow auto-merge for meld to follow the vim-diff behavior	2020-09-16 17:11:20 -07:00
nvimdiff	mergetools: add support for nvimdiff (neovim) family	2020-07-29 14:44:49 -07:00
opendiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
p4merge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
smerge	mergetools: add support for smerge (Sublime Merge)	2019-04-04 18:21:25 +09:00
tkdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
tortoisemerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
vimdiff	mergetools/vimdiff: add vimdiff1 merge tool variant	2021-02-23 11:37:13 -08:00
winmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
xxdiff	Merge branch 'da/mergetool-xxdiff-hotkey'	2016-12-19 14:45:41 -08:00