Bugfix: concatenate merge commands properly

svn changeset:22804/svn branch:6.8

diff --git a/scripts/merge-all.sh b/scripts/merge-all.sh
index eda311cc3a2040ad16bc6df09455b22e8bf0740f..47541866459155844e6e6a7ebebab040046f15ca 100755 (executable)
--- a/scripts/merge-all.sh
+++ b/scripts/merge-all.sh
@@ -40,7 +40,7 @@ cmd=""
 for revision in $unmerged
 do
        thiscmd=`dirname $0`"/merge.sh $FROM $revision $AUTOCOMMIT $IGNOREDIRTY"
-       cmd="$thiscmd && "
+       cmd="$cmd $thiscmd && "
        if [ "$AUTOMERGE" = "automerge" ]
        then
                echo "Merging [$revision]..."