X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge.sh;fp=git-merge.sh;h=4609fe54d52843f42d2c1d18a9dc2ff235b5c7ce;hb=664368886781b7c070233c002597b84628eec571;hp=2b4a603dffb5d82cf6fd7cf0ac83ae4cdad703de;hpb=83f50539a9b1f18ccf0a4e1b84169eb4a24b3ea4;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 2b4a603d..4609fe54 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" \