git-svn: reintroduce using a single get_log() to fetch

diff --git a/git-merge.sh b/git-merge.sh
index 04a5eb0f297a691fa0520d1729ea20bd66a53bd9..498c938c4507ccdc27f5a9e30e85f013a067c876 100755 (executable)
--- 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