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

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index 5b63b64c1e5e4fa010d9bad45812d45fac1a8342..dbee7ccdc4ed2ad5dbccc51d3e94797f1fbc15fe 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -9,7 +9,7 @@ branch=""
 file="$*"
 
 gitk --merge -- $file &
-[ "$file" ] && gvim $file
+[ "$file" ] && gvim $file 2>/dev/null
 
 conf="a conflict"
 [ "$#" -gt 1 ] && {
@@ -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).