Skip to content

Commit f6e97e7

Browse files
committed
Tweaked merge script
- Legacy-Id: 8887
1 parent a41f247 commit f6e97e7

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

bin/mergedevbranch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ read -p "Continue with the commit? [Y/n] "
208208
if [ "$ARG_COMMIT" != 0 ]; then
209209
echo "Committing the merge:"
210210
echo ""
211-
svn commit -m "Merged in [$rev] from $who:\n ${comment//\"/\'} ${fix//\"/\'}"
211+
svn commit -m "Merged in [$rev] from $who:
212+
${comment//\"/\'} ${fix//\"/\'}"
212213
else
213214
echo "This merge has not been committed yet."
214215
echo "To commit it, run this commit command: ../cicmd/commit-$rev-merge.sh"

0 commit comments

Comments
 (0)