1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-06 14:36:18 +02:00
git/mergetools
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
bc mergetool--lib: improve support for vimdiff-style tool variants 2020-07-29 14:44:46 -07:00
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
guiffy mergetools: add support for guiffy 2018-04-06 08:11:39 +09:00
gvimdiff
kdiff3
kompare
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
p4merge
smerge mergetools: add support for smerge (Sublime Merge) 2019-04-04 18:21:25 +09:00
tkdiff
tortoisemerge
vimdiff mergetools: add support for nvimdiff (neovim) family 2020-07-29 14:44:49 -07:00
winmerge
xxdiff Merge branch 'da/mergetool-xxdiff-hotkey' 2016-12-19 14:45:41 -08:00