difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff

diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index 9c0a13452a60059b504f07cb94a3cc16e1a2e6e7..ef684b6f68e8376fb20761b8936bef6d9dbee2e3 100755 (executable)
--- a/contrib/difftool/git-difftool-helper
+++ b/contrib/difftool/git-difftool-helper
@@ -69,7 +69,7 @@ launch_merge_tool () {
                "$merge_tool_path" --auto \
                        --L1 "$basename (A)" \
                        --L2 "$basename (B)" \
-                       -o "$MERGED" "$LOCAL" "$REMOTE" \
+                       "$LOCAL" "$REMOTE" \
                        > /dev/null 2>&1
                ;;
 
@@ -78,7 +78,7 @@ launch_merge_tool () {
                ;;
 
        tkdiff)
-               "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+               "$merge_tool_path" "$LOCAL" "$REMOTE"
                ;;
 
        meld)
@@ -86,26 +86,22 @@ launch_merge_tool () {
                ;;
 
        vimdiff)
-               "$merge_tool_path" -c "wincmd l" "$LOCAL" "$REMOTE"
+               "$merge_tool_path" -d -c "wincmd l" "$LOCAL" "$REMOTE"
                ;;
 
        gvimdiff)
-               "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$REMOTE"
+               "$merge_tool_path" -d -c "wincmd l" -f "$LOCAL" "$REMOTE"
                ;;
 
        xxdiff)
                "$merge_tool_path" \
-                       -X \
-                       -R 'Accel.SaveAsMerged: "Ctrl-S"' \
                        -R 'Accel.Search: "Ctrl+F"' \
                        -R 'Accel.SearchForward: "Ctrl-G"' \
-                       --merged-file "$MERGED" \
                        "$LOCAL" "$REMOTE"
                ;;
 
        opendiff)
-               "$merge_tool_path" "$LOCAL" "$REMOTE" \
-                       -merge "$MERGED" | cat
+               "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
                ;;
 
        ecmerge)
@@ -160,6 +156,12 @@ init_merge_tool_path() {
        merge_tool_path=$(git config mergetool."$1".path)
        if test -z "$merge_tool_path"; then
                case "$1" in
+               vimdiff)
+                       merge_tool_path=vim
+                       ;;
+               gvimdiff)
+                       merge_tool_path=gvim
+                       ;;
                emerge)
                        merge_tool_path=emacs
                        ;;