From: Michael Ellerman <mpe@ellerman.id.au>
Date: Thu, 11 Jun 2015 22:16:40 +0000 (+1000)
Subject: merge_msg: Add placeholders so we don't forget to fill them in
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=a9b06fceaf331247a0b4501f683343efeb7d58ec;p=next-scripts

merge_msg: Add placeholders so we don't forget to fill them in
---

diff --git a/merge_msg b/merge_msg
index f5dc1d4..dbee7cc 100755
--- a/merge_msg
+++ b/merge_msg
@@ -18,10 +18,10 @@ conf="a conflict"
 	conf="conflicts"
 }
 
-subject="manual merge of the BRANCH tree with the  tree"
+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  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).