diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-16 15:08:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-16 15:08:46 -0800 |
| commit | 53756f290b94a0f8ee7021713fa63540d1a7e4e8 (patch) | |
| tree | 53ba4f90775e57fc7d0eec6d3ef2fbb4dcb7b393 | |
| parent | af99711cd84c30a16450f73dbc21ba9f9f9803e6 (diff) | |
| parent | de6f0def506935811384a39fb0660095f5555e68 (diff) | |
| download | git-53756f290b94a0f8ee7021713fa63540d1a7e4e8.tar.gz | |
Merge branch 'maint'
* maint:
git-merge: minor fix for no_trivial_merge_strategies.
| -rwxr-xr-x | git-merge.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/git-merge.sh b/git-merge.sh index 04a5eb0f29..498c938c45 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -254,12 +254,15 @@ esac for s in $use_strategies do - case " $s " in - *" $no_trivial_merge_strategies "*) - index_merge=f - break - ;; - esac + for nt in $no_trivial_merge_strategies + do + case " $s " in + *" $nt "*) + index_merge=f + break + ;; + esac + done done case "$#" in |