global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 01:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

mergetools: add support for nvimdiff (neovim) family

Browse Source 
Signed-off-by: pudinha <rogi@skylittlesystem.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
pudinha
2020-07-29 22:31:13 +01:00
committed by Junio C Hamano
parent 83bbf9b92e
commit 11868978c7
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-mergetool--lib.sh
View File

@@ -304,11 +304,14 @@ list_merge_tool_candidates () {
tools="$tools smerge"
fi
case "${VISUAL:-$EDITOR}" in
*nvim*)
tools="$tools nvimdiff vimdiff emerge"
;;
*vim*)
tools="$tools vimdiff emerge"
tools="$tools vimdiff nvimdiff emerge"
;;
*)
tools="$tools emerge vimdiff"
tools="$tools emerge vimdiff nvimdiff"
;;
esac
}