diff options
| -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 |