X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=4afcd95316c01e5d1811184c615c4da574ab0717;hb=d58c6184e345b9c8c8bfe8cc3eb1bbfe2f5ee4f9;hp=04a5eb0f297a691fa0520d1729ea20bd66a53bd9;hpb=76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 04a5eb0f2..4afcd9531 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
@@ -291,7 +294,7 @@ f,*)
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-	finish "$new_head" "Fast forward"
+	finish "$new_head" "Fast forward" || exit
 	dropsave
 	exit 0
 	;;