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