4 [ -f merge.log ] && log=merge.log
5 control=../real_control
6 [ -f real_control ] && control=real_control
15 branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
19 contact=$(awk -F ' ' '$3=="'"$branch"'" { print $1; }' $control)
20 greeting=${contact%% *}
21 greeting=${greeting#\"}
22 [ "${contact%,*}" = "${contact}" ] || greeting="all"
26 gitk --merge -- $file &
27 [ "$file" ] && gvim $file
29 sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the tree&Body=Hi $greeting,%0A\
31 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.%0A\
33 I fixed it up (see below) and can carry the fix as necessary (no action%0A\