projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge part of jc/portable branch
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
2b4a603
..
4609fe5
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=
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" \
dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \