various fixes

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index 3433b920dd3ae5c27b788bf6c4864cedb6f4d830..573dded5f885ce26bb14646beb0039fbe8074461 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -11,6 +11,6 @@ branch=${branch%%/*}
 
 contact=$(sed -n "/    $branch /s/     .*$//p" $control)
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of $branch tree&Body=Hi ,%0A\
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
 %0A\
-Today's linux-next merge of the $branch tree got a conflict in  between commit  ("") from the  tree and commit  ("") from the $branch tree."
+Today's linux-next merge of the $branch tree got a conflict in  between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."