From 61a2ece8f71511628463cb3f65dad2c271ccc696 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Jul 2015 16:02:27 +1000
Subject: [PATCH] only put the FIXME text in the merge fix messages

---
 merge_msg  | 3 +++
 send_email | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/merge_msg b/merge_msg
index 2014426..62227bd 100755
--- a/merge_msg
+++ b/merge_msg
@@ -21,6 +21,9 @@ conf="a conflict"
 subject="manual merge of the BRANCH tree with the FIXME tree"
 
 $(dirname $0)/message_helper $branch "$subject" <<EOF
+FIXME: Add owner of second tree to To:
+       Add author(s)/SOB of conflicting commits.
+
 Today's linux-next merge of the BRANCH tree got $conf in:
 
   $file
diff --git a/send_email b/send_email
index 37e5c34..475a953 100755
--- a/send_email
+++ b/send_email
@@ -12,9 +12,6 @@ To: $to
 Cc: $cc
 Subject: $subject
 
-FIXME: Add owner of second tree to To:
-       Add author(s)/SOB of conflicting commits.
-
 EOF
 	cat
 ) > $TARGET
-- 
2.39.2