瀏覽代碼

Bugfix: concatenate merge commands properly

svn changeset:22804/svn branch:6.8
tags/7.0.0.alpha2
Johannes Dahlström 12 年之前
父節點
當前提交
f315689eff
共有 1 個檔案被更改,包括 1 行新增1 行删除
  1. 1
    1
      scripts/merge-all.sh

+ 1
- 1
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]..."

Loading…
取消
儲存