10 [ "$#" ] && gvim "$@" 2>/dev/null
12 printf -v files " %s\n" "$@"
17 subject="manual merge of the BRANCH tree with the FIXME tree"
19 $(dirname $0)/message_helper $branch "$subject" <<EOF
20 FIXME: Add owner of second tree to To:
21 Add author(s)/SOB of conflicting commits.
23 Today's linux-next merge of the BRANCH tree got $conf in:
30 from the FIXME tree and commit:
36 I fixed it up (see below) and can carry the fix as necessary (no action is required).