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 FIXME: Add owner of second tree to To:
25 Add author(s)/SOB of conflicting commits.
27 Today's linux-next merge of the BRANCH tree got $conf in:
35 from the FIXME tree and commit:
41 I fixed it up (see below) and can carry the fix as necessary (no action is required).