diff --git a/scripts/bump.sh b/scripts/bump.sh index 6b95d5e..d91164a 100755 --- a/scripts/bump.sh +++ b/scripts/bump.sh @@ -33,7 +33,7 @@ then fi git checkout release -#git merge master +#git merge release-VER branch into 'release' git merge -s recursive -X theirs release-$VERSION ( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \