X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=7be9e81f1f886c6e0b4c6be8758bd7ba25f5b04c;hb=d5dddccaa0c61c67340efca36237dfa06eccef1c;hp=c258ea78bcd5dc944155b629ef429de247a6bac5;hpb=7bd1527d2d8c80a6e9a0f8583082a5aee5428c68;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index c258ea78..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" \