Junio C Hamano d203add892 Merge branch 'pd/mergetool-nvimdiff' ... Fix regression introduced when nvimdiff support in mergetool was added. * pd/mergetool-nvimdiff: mergetool: avoid letting `list_tool_variants` break user-defined setups mergetools/bc: add `bc4` to the alias list for Beyond Compare		2020-11-21 15:14:39 -08: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	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
kdiff3	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08: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: add support for nvimdiff (neovim) family	2020-07-29 14:44:49 -07: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