undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
git-commit-vandalism/mergetools
History
pudinha 11868978c7 mergetools: add support for nvimdiff (neovim) family 
Signed-off-by: pudinha <rogi@skylittlesystem.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-07-29 14:44:49 -07:00
..
araxis
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
bc
mergetool--lib: improve support for vimdiff-style tool variants
2020-07-29 14:44:46 -07: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
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
mergetools/meld: improve compatibiilty with Meld on macOS X
2017-06-18 22:11:29 -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