4 [ -f merge.log ] && log=merge.log
5 control=../real_control
6 [ -f real_control ] && control=real_control
8 branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
9 branch=${branch#quilt/}
12 contact=$(sed -n "/ $branch /s/ .*$//p" $control)
13 greeting=${contact%% *}
14 [ "${contact%,*}" = "${contact}" ] || greeting="all"
18 gitk --merge -- $file &
19 [ "$file" ] && gvim $file
21 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\
23 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."