From 7ffa300973169000ea17a9411ff66b247d8607bd Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 20 Jun 2015 19:04:29 +1000
Subject: [PATCH] merge_msg: reformat the message like mpe's version

---
 merge_msg | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/merge_msg b/merge_msg
index dbee7cc..2014426 100755
--- 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).
-- 
2.39.2