merge_msg: reformat the message like mpe's version

diff --git a/merge_msg b/merge_msg
index dbee7ccdc4ed2ad5dbccc51d3e94797f1fbc15fe..201442612f5ffb39497f3cdfd46662deb0ad4e01 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -21,7 +21,19 @@ conf="a conflict"
 subject="manual merge of the BRANCH tree with the FIXME tree"
 
 $(dirname $0)/message_helper $branch "$subject" <<EOF
-Today's linux-next merge of the BRANCH tree got $conf in $file between commit  ("") from the FIXME tree and commit  ("") from the BRANCH tree.
+Today's linux-next merge of the BRANCH tree got $conf in:
+
+  $file
+
+between commit:
+
+   ("")
+
+from the FIXME tree and commit:
+
+   ("")
+
+from the BRANCH tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).