X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=cc0952a97db7d998a3f26e98b93cf2154887abd5;hb=72095d5c3779344de13c47a8b1cb163b2d94126e;hp=c258ea78bcd5dc944155b629ef429de247a6bac5;hpb=744633cbf23d3ed505f96ffc212b30c96b79fb90;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index c258ea78..cc0952a9 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" \
@@ -127,7 +131,7 @@ case "$#,$common,$no_commit" in
 	;;
 1,"$head",*)
 	# Again the most common case of merging one remote.
-	echo "Updating from $head to $1."
+	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 -v -m $head "$new_head" &&