aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2009-04-06 01:31:19 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-07 22:19:55 -0700
commit76ca653842057766773776bffc6a415b39d5a147 (patch)
treec1fcbd4fa3c3819f0b3a132048ad92daf74c63c6 /contrib
parentb98c212a9fd97300a8cf39015b8d693f319fd71c (diff)
downloadgit-76ca653842057766773776bffc6a415b39d5a147.tar.gz
git-76ca653842057766773776bffc6a415b39d5a147.tar.xz
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>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/difftool/git-difftool-helper10
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index e481913c9..ef684b6f6 100755
--- 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)
@@ -95,17 +95,13 @@ launch_merge_tool () {
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)