mergetool-lib: combine vimdiff and gvimdiff run blocks

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index b5e1943b1d166b543998c80579c65e82de36516a..f9a51ba50448c8e275c14e0e33afa31239c890a9 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -169,25 +169,14 @@ run_merge_tool () {
                        "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
                fi
                ;;
-       vimdiff)
-               if merge_mode; then
-                       touch "$BACKUP"
-                       "$merge_tool_path" -d -c "wincmd l" \
-                               "$LOCAL" "$MERGED" "$REMOTE"
-                       check_unchanged
-               else
-                       "$merge_tool_path" -d -c "wincmd l" \
-                               "$LOCAL" "$REMOTE"
-               fi
-               ;;
-       gvimdiff)
+       vimdiff|gvimdiff)
                if merge_mode; then
                        touch "$BACKUP"
-                       "$merge_tool_path" -d -c "wincmd l" -f \
+                       "$merge_tool_path" -f -d -c "wincmd l" \
                                "$LOCAL" "$MERGED" "$REMOTE"
                        check_unchanged
                else
-                       "$merge_tool_path" -d -c "wincmd l" -f \
+                       "$merge_tool_path" -f -d -c "wincmd l" \
                                "$LOCAL" "$REMOTE"
                fi
                ;;