4 if [ "X$1" = 'X-b' ]; then
11 tools_dir=$(dirname "$0")
13 printf -v files ' %s\n' "$@"
15 if [ "$#" -gt 1 ]; then
19 subject='manual merge of the BRANCH tree with the FIXME tree'
21 "$tools_dir/message_helper" "${branch[@]}" "$subject" <<EOF
22 FIXME: Add owner of second tree to To:
23 Add author(s)/SOB of conflicting commits.
25 Today's linux-next merge of the BRANCH tree got $conf in:
32 from the FIXME tree and commit:
38 I fixed it up (see below) and can carry the fix as necessary. This
39 is now fixed as far as linux-next is concerned, but any non trivial
40 conflicts should be mentioned to your upstream maintainer when your tree
41 is submitted for merging. You may also want to consider cooperating
42 with the maintainer of the conflicting tree to minimise any particularly