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

We shouldn't try to merge files when using difftool, so remove
any merge-specific options.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index e481913c91c83a19c5e10db1f66949c60d24b4f1..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)" \
                "$merge_tool_path" --auto \
                        --L1 "$basename (A)" \
                        --L2 "$basename (B)" \

-                       -o "$MERGED" "$LOCAL" "$REMOTE" \
+                       "$LOCAL" "$REMOTE" \

                        > /dev/null 2>&1
                ;;
 
                        > /dev/null 2>&1
                ;;
 


@@ -78,7 +78,7 @@ launch_merge_tool () {
                ;;
 
        tkdiff)
                ;;
 
        tkdiff)

-               "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+               "$merge_tool_path" "$LOCAL" "$REMOTE"

                ;;
 
        meld)
                ;;
 
        meld)


@@ -95,17 +95,13 @@ launch_merge_tool () {
 
        xxdiff)
                "$merge_tool_path" \
 
        xxdiff)
                "$merge_tool_path" \

-                       -X \
-                       -R 'Accel.SaveAsMerged: "Ctrl-S"' \

                        -R 'Accel.Search: "Ctrl+F"' \
                        -R 'Accel.SearchForward: "Ctrl-G"' \
                        -R 'Accel.Search: "Ctrl+F"' \
                        -R 'Accel.SearchForward: "Ctrl-G"' \

-                       --merged-file "$MERGED" \

                        "$LOCAL" "$REMOTE"
                ;;
 
        opendiff)
                        "$LOCAL" "$REMOTE"
                ;;
 
        opendiff)

-               "$merge_tool_path" "$LOCAL" "$REMOTE" \
-                       -merge "$MERGED" | cat
+               "$merge_tool_path" "$LOCAL" "$REMOTE" | cat

                ;;
 
        ecmerge)
                ;;
 
        ecmerge)