diff options
Diffstat (limited to '')
-rw-r--r-- | third_party/git/mergetools/vimdiff | 21 | ||||
-rw-r--r-- | third_party/git/mergetools/vimdiff2 | 1 | ||||
-rw-r--r-- | third_party/git/mergetools/vimdiff3 | 1 |
3 files changed, 16 insertions, 7 deletions
diff --git a/third_party/git/mergetools/vimdiff b/third_party/git/mergetools/vimdiff index 10d86f3e19..abc8ce4ec4 100644 --- a/third_party/git/mergetools/vimdiff +++ b/third_party/git/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 @@ -46,3 +49,11 @@ translate_merge_tool_path() { exit_code_trustable () { true } + +list_tool_variants () { + for prefix in '' g n; do + for suffix in '' 2 3; do + echo "${prefix}vimdiff${suffix}" + done + done +} diff --git a/third_party/git/mergetools/vimdiff2 b/third_party/git/mergetools/vimdiff2 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/third_party/git/mergetools/vimdiff2 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/third_party/git/mergetools/vimdiff3 b/third_party/git/mergetools/vimdiff3 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/third_party/git/mergetools/vimdiff3 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" |