merge_msg: reformat the message like mpe's version

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index 626cf943460a1bd7a8b36a28217f53596cdfeeab..201442612f5ffb39497f3cdfd46662deb0ad4e01 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,12 +18,25 @@ conf="a conflict"
        conf="conflicts"
 }
 
-subject="manual merge of the BRANCH tree with the  tree"
-body="Today's linux-next merge of the BRANCH tree got $conf in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the BRANCH tree.%0A\
-%0A\
-I fixed it up (see below) and can carry the fix as necessary (no action%0A\
-is required)."
+subject="manual merge of the BRANCH tree with the FIXME tree"
 
-$(dirname $0)/message_helper $branch "$subject" "$body"
+$(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.
+
+I fixed it up (see below) and can carry the fix as necessary (no action
+is required).
+EOF
 
 exit 0