summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-16 15:08:46 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-16 15:08:46 -0800
commit53756f290b94a0f8ee7021713fa63540d1a7e4e8 (patch)
tree53ba4f90775e57fc7d0eec6d3ef2fbb4dcb7b393
parentMerge branch 'maint' (diff)
parentgit-merge: minor fix for no_trivial_merge_strategies. (diff)
downloadtgif-53756f290b94a0f8ee7021713fa63540d1a7e4e8.tar.xz
Merge branch 'maint'
* maint: git-merge: minor fix for no_trivial_merge_strategies.
-rwxr-xr-xgit-merge.sh15
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