#!/bin/bash

branch=""
[ "$1" = "-t" ] && {
        branch="-t $2"
        shift 2
}

file="$*"

gitk --merge -- $file &
[ "$file" ] && gvim $file 2>/dev/null

conf="a conflict"
[ "$#" -gt 1 ] && {
	file=${file// /, }
	file=$(echo $file | sed 's/,\([^,]*\)$/ and\1/')
	conf="conflicts"
}

subject="manual merge of the BRANCH tree with the  tree"

$(dirname $0)/message_helper $branch "$subject" <<EOF
Today's linux-next merge of the BRANCH tree got $conf in $file between commit  ("") from the  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