X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=7be9e81f1f886c6e0b4c6be8758bd7ba25f5b04c;hb=ee75d4cd310a2d45b641f4524565bea6fd1d1ecc;hp=2b4a603dffb5d82cf6fd7cf0ac83ae4cdad703de;hpb=8cf828b43c3c1ee6d85622d155a1b0639842f66a;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 2b4a603d..7be9e81f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -13,6 +13,10 @@ LF='
 all_strategies='recursive octopus resolve stupid ours'
 default_strategies='recursive'
 use_strategies=
+if test "@@NO_PYTHON@@"; then
+	all_strategies='resolve octopus stupid ours'
+	default_strategies='resolve'
+fi
 
 dropsave() {
 	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
@@ -130,7 +134,7 @@ case "$#,$common,$no_commit" in
 	echo "Updating from $head to $1."
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
-	git-read-tree -u -m $head "$new_head" &&
+	git-read-tree -u -v -m $head "$new_head" &&
 	finish "$new_head" "Fast forward"
 	dropsave
 	exit 0
@@ -146,7 +150,7 @@ case "$#,$common,$no_commit" in
 
 	echo "Trying really trivial in-index merge..."
 	git-update-index --refresh 2>/dev/null
-	if git-read-tree --trivial -m -u $common $head "$1" &&
+	if git-read-tree --trivial -m -u -v $common $head "$1" &&
 	   result_tree=$(git-write-tree)
 	then
 	    echo "Wonderful."