combine the merge_msg* commands

generate a bit more of the message

diff --git a/merge_msg b/merge_msg
index 573dded5f885ce26bb14646beb0039fbe8074461..ba04ef592e9fb727fbc589405a143ca8efaadc25 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -10,7 +10,16 @@ branch=${branch#quilt/}
 branch=${branch%%/*}
 
 contact=$(sed -n "/    $branch /s/     .*$//p" $control)
+greeting=${contact%% *}
+[ "${contact%,*}" = "${contact}" ] || greeting="all"
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
+file="$*"
+
+gitk --merge -- $file &
+[ "$file" ] && gvim $file
+
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\
 %0A\
-Today's linux-next merge of the $branch tree got a conflict in  between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
+Today's linux-next merge of the $branch tree got a conflict in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
+
+exit 0