diff options
| author | pudinha <rogi@skylittlesystem.org> | 2020-07-30 00:31:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 00:44:49 +0300 |
| commit | 11868978c7c80d3c29071b29e7964e3d62523819 (patch) | |
| tree | ea8b30e3887f0c8294f7c0a7eafff8059cc5ffa7 /git-mergetool--lib.sh | |
| parent | 83bbf9b92ea8a10a60f44369a200b39ce5db78cd (diff) | |
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 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 29fecc340f..2defef28cd 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -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 } |