X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-mergetool.sh;h=fcdec4a504acd5681e0695fb9657d6a1cd513ab0;hb=60727b5800d7791e5b107620cb5b2d344cf97fe9;hp=5c86f69229042c16704d11ce404e43297cc7b72c;hpb=6e79a8858560a3a3e2b5e092a6cbdd5f3f1ad13b;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5c86f6922..fcdec4a50 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -237,9 +237,9 @@ merge_file () {
 	ecmerge)
 	    touch "$BACKUP"
 	    if base_present; then
-		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$MERGED"
+		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"
 	    else
-		"$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$MERGED"
+		"$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED"
 	    fi
 	    check_unchanged
 	    ;;