summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-02-18 12:01:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-19 07:16:09 (GMT)
commitabb7c7b31c0896bd838bbb6437b310db5a42227a (patch)
treeca184974f14d8cd61e1a7c25173edcae17c9e7cb /git-merge.sh
parent289c4b36e336af5266b86d924ef0aa828e8e4841 (diff)
downloadgit-abb7c7b31c0896bd838bbb6437b310db5a42227a.zip
git-abb7c7b31c0896bd838bbb6437b310db5a42227a.tar.gz
git-abb7c7b31c0896bd838bbb6437b310db5a42227a.tar.bz2
Optionally work without python
In some setups (notably server setups) you do not need that dependency. Gracefully handle the absence of python when NO_PYTHON is defined. Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 74f0761..a05eeb2 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" \