refactor mail composing

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index 626cf943460a1bd7a8b36a28217f53596cdfeeab..5b63b64c1e5e4fa010d9bad45812d45fac1a8342 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -19,11 +19,12 @@ conf="a conflict"
 }
 
 subject="manual merge of the BRANCH tree with the  tree"
-body="Today's linux-next merge of the BRANCH tree got $conf 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)."
 
-$(dirname $0)/message_helper $branch "$subject" "$body"
+$(dirname $0)/message_helper $branch "$subject" <<EOF
+Today's linux-next merge of the BRANCH tree got $conf in $file between commit  ("") from the  tree and commit  ("") from the BRANCH tree.
+
+I fixed it up (see below) and can carry the fix as necessary (no action
+is required).
+EOF
 
 exit 0