summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorpudinha <rogi@skylittlesystem.org>2020-07-29 21:31:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-29 21:44:49 (GMT)
commit11868978c7c80d3c29071b29e7964e3d62523819 (patch)
treeea8b30e3887f0c8294f7c0a7eafff8059cc5ffa7 /contrib
parent83bbf9b92ea8a10a60f44369a200b39ce5db78cd (diff)
downloadgit-11868978c7c80d3c29071b29e7964e3d62523819.zip
git-11868978c7c80d3c29071b29e7964e3d62523819.tar.gz
git-11868978c7c80d3c29071b29e7964e3d62523819.tar.bz2
mergetools: add support for nvimdiff (neovim) family
Signed-off-by: pudinha <rogi@skylittlesystem.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ee468ea..aed08f8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1712,8 +1712,8 @@ _git_diff ()
}
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
- codecompare smerge
+ tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge
+ bc codecompare smerge
"
_git_difftool ()