Merge branch 'rs/preserve-merges-unused-code-removal'

[thirdparty/git.git] / mergetools / vimdiff

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 10d86f3e19304125cecf06ddad928b9ffe2d0c08..abc8ce4ec44e190812ba46b39b8ba2dec1cc14fe 100644 (file)
--- 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
@@ -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
+}