11 gitk --merge -- $file &
12 [ "$file" ] && gvim $file 2>/dev/null
17 file=$(echo $file | sed 's/,\([^,]*\)$/ and\1/')
21 subject="manual merge of the BRANCH tree with the FIXME tree"
23 $(dirname $0)/message_helper $branch "$subject" <<EOF
24 Today's linux-next merge of the BRANCH tree got $conf in $file between commit ("") from the FIXME tree and commit ("") from the BRANCH tree.
26 I fixed it up (see below) and can carry the fix as necessary (no action