Merge part of js/portable into next

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 2b4a603dffb5d82cf6fd7cf0ac83ae4cdad703de..4609fe54d52843f42d2c1d18a9dc2ff235b5c7ce 100755 (executable)
--- 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" \