]> git.ipfire.org Git - thirdparty/git.git/commit - mergetools/vimdiff
mergetools: add support for nvimdiff (neovim) family
authorpudinha <rogi@skylittlesystem.org>
Wed, 29 Jul 2020 21:31:13 +0000 (22:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Jul 2020 21:44:49 +0000 (14:44 -0700)
commit11868978c7c80d3c29071b29e7964e3d62523819
treeea8b30e3887f0c8294f7c0a7eafff8059cc5ffa7
parent83bbf9b92ea8a10a60f44369a200b39ce5db78cd
mergetools: add support for nvimdiff (neovim) family

Signed-off-by: pudinha <rogi@skylittlesystem.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash
git-mergetool--lib.sh
mergetools/nvimdiff [new file with mode: 0644]
mergetools/vimdiff