From 4481ff048df4c86021d783de6f099909495f04ff Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 2 May 2009 01:57:21 -0700 Subject: [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge The ecmerge documentation mentions the following form: ecmerge --mode=diff2 $1 $2 Since git-difftool is about diffing, we should use that instead of --mode=merge2. Likewise, this drops the $MERGED argument to emerge, as discussed on the git list ($gmane/117930). Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-mergetool--lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index a16a2795d7..8b5e6a8c64 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -228,8 +228,8 @@ run_merge_tool () { fi check_unchanged else - "$merge_tool_path" "$LOCAL" "$REMOTE" \ - --default --mode=merge2 --to="$MERGED" + "$merge_tool_path" --default --mode=diff2 \ + "$LOCAL" "$REMOTE" fi ;; emerge) @@ -248,7 +248,7 @@ run_merge_tool () { status=$? else "$merge_tool_path" -f emerge-files-command \ - "$LOCAL" "$REMOTE" "$(basename "$MERGED")" + "$LOCAL" "$REMOTE" fi ;; tortoisemerge) -- 2.11.4.GIT