Merge branch 'maint'

* maint: git-merge: minor fix for no_trivial_merge_strategies.
git-mirror · Feb 16, 2007 · 53756f2 · 53756f2
2 parents af99711 + de6f0de
commit 53756f2
Showing 1 changed file with 9 additions and 6 deletions.
diff --git 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