#!/bin/bash

log=../merge.log
[ -f merge.log ] && log=merge.log
control=../real_control
[ -f real_control ] && control=real_control

branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
branch=${branch#quilt/}
branch=${branch%%/*}

contact=$(sed -n "/	$branch	/s/	.*$//p" $control)

gitk --merge -- $1 &
gvim $1
sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
%0A\
Today's linux-next merge of the $branch tree got a conflict in $1 between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."