mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
David Aguilar
2009-04-06 01:31:19 -07:00
committed by Junio C Hamano
parent b98c212a9f
commit 76ca653842
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/difftool/git-difftool-helper
View File

@ -69,7 +69,7 @@ launch_merge_tool () {
"$merge_tool_path" --auto \ "$merge_tool_path" --auto \
--L1 "$basename (A)" \ --L1 "$basename (A)" \
--L2 "$basename (B)" \ --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) xxdiff)
"$merge_tool_path" \ "$merge_tool_path" \
-X \
-R 'Accel.SaveAsMerged: "Ctrl-S"' \
-R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.Search: "Ctrl+F"' \
-R 'Accel.SearchForward: "Ctrl-G"' \ -R 'Accel.SearchForward: "Ctrl-G"' \
--merged-file "$MERGED" \
"$LOCAL" "$REMOTE" "$LOCAL" "$REMOTE"
;; ;;
opendiff) opendiff)
"$merge_tool_path" "$LOCAL" "$REMOTE" \ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
-merge "$MERGED" | cat
;; ;;
ecmerge) ecmerge)