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>
David Aguilar committed
Apr 6, 2009 at 01:31 UTC
76ca653842057766773776bffc6a415b39d5a147
1 file changed
+3
-7
contrib/difftool/git-difftool-helper
+3
-7
@@ -69,7 +69,7 @@ launch_merge_tool () {
69
"$merge_tool_path" --auto \
70
--L1 "$basename (A)" \
71
--L2 "$basename (B)" \
72
- -o "$MERGED" "$LOCAL" "$REMOTE" \
72
+ "$LOCAL" "$REMOTE" \
73
> /dev/null 2>&1
74
;;
75
@@ -78,7 +78,7 @@ launch_merge_tool () {
78
;;
79
80
tkdiff)
81
- "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
81
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
82
;;
83
84
meld)
@@ -95,17 +95,13 @@ launch_merge_tool () {
95
96
xxdiff)
97
"$merge_tool_path" \
98
- -X \
99
- -R 'Accel.SaveAsMerged: "Ctrl-S"' \
98
-R 'Accel.Search: "Ctrl+F"' \
99
-R 'Accel.SearchForward: "Ctrl-G"' \
102
- --merged-file "$MERGED" \
100
"$LOCAL" "$REMOTE"
101
;;
102
103
opendiff)
107
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
108
- -merge "$MERGED" | cat
104
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
105
;;
106
107
ecmerge)