various updates

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index b314ed2d209935805a5cbe32f1c7b78d47521a7c..e436cd5f24307db791c114777a440e397e3fd82e 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -13,7 +13,6 @@ branch=""
 
 [ "$branch" ] || {
        branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
-       branch=${branch#quilt/}
        branch=${branch%%/*}
 }
 
@@ -29,6 +28,9 @@ gitk --merge -- $file &
 
 sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\
 %0A\
-Today's linux-next merge of the $branch tree got a conflict in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
+Today's linux-next merge of the $branch tree got a conflict in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree.%0A\
+%0A\
+I fixed it up (see below) and can carry the fix as necessary (no action%0A\
+is required)."
 
 exit 0