diff --git a/git-merge.sh b/git-merge.sh
index c258ea78bcd5dc944155b629ef429de247a6bac5..7be9e81f1f886c6e0b4c6be8758bd7ba25f5b04c 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
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" \