From 11868978c7c80d3c29071b29e7964e3d62523819 Mon Sep 17 00:00:00 2001 From: pudinha Date: Wed, 29 Jul 2020 22:31:13 +0100 Subject: mergetools: add support for nvimdiff (neovim) family Signed-off-by: pudinha Signed-off-by: Junio C Hamano --- mergetools/nvimdiff | 1 + mergetools/vimdiff | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 mergetools/nvimdiff (limited to 'mergetools') diff --git a/mergetools/nvimdiff b/mergetools/nvimdiff new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/nvimdiff @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 3925e1fc3e..abc8ce4ec4 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -5,7 +5,7 @@ diff_cmd () { merge_cmd () { case "$1" in - gvimdiff|vimdiff) + *vimdiff) if $base_present then "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \ @@ -15,11 +15,11 @@ merge_cmd () { "$LOCAL" "$MERGED" "$REMOTE" fi ;; - gvimdiff2|vimdiff2) + *vimdiff2) "$merge_tool_path" -f -d -c 'wincmd l' \ "$LOCAL" "$MERGED" "$REMOTE" ;; - gvimdiff3|vimdiff3) + *vimdiff3) if $base_present then "$merge_tool_path" -f -d -c 'hid | hid | hid' \ @@ -34,10 +34,13 @@ merge_cmd () { translate_merge_tool_path() { case "$1" in - gvimdiff|gvimdiff2|gvimdiff3) + nvimdiff*) + echo nvim + ;; + gvimdiff*) echo gvim ;; - vimdiff|vimdiff2|vimdiff3) + vimdiff*) echo vim ;; esac @@ -48,7 +51,7 @@ exit_code_trustable () { } list_tool_variants () { - for prefix in '' g; do + for prefix in '' g n; do for suffix in '' 2 3; do echo "${prefix}vimdiff${suffix}" done -- cgit v1.2.3