X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=8b5e6a8c64238be2534689113984b7eaf07e94e2;hb=ce61595ea7eb3df22f6a943a38a273141f1af978;hp=a16a2795d70779365212c09b6d0dd42d1746842b;hpb=75b44066f3ed7cde238cdea1f0bf9e2f1744c820;p=git.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index a16a2795d..8b5e6a8c6 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)