diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:52:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:52:18 -0800 |
| commit | 664368886781b7c070233c002597b84628eec571 (patch) | |
| tree | 2cb6cf87bdb0ca4ecfe8487cf4fef71fd26e8197 /git-merge.sh | |
| parent | 83f50539a9b1f18ccf0a4e1b84169eb4a24b3ea4 (diff) | |
| parent | abb7c7b31c0896bd838bbb6437b310db5a42227a (diff) | |
| download | git-664368886781b7c070233c002597b84628eec571.tar.gz git-664368886781b7c070233c002597b84628eec571.tar.xz | |
Merge part of jc/portable branch
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 2b4a603df..4609fe54d 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" \ |