-[ "$branch" ] || {
- branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
- branch=${branch#quilt/}
- branch=${branch%%/*}
-}
+gitk --merge -- "$@" &
+# [ "$#" ] && gvim "$@" 2>/dev/null
+
+printf -v files " %s\n" "$@"
+conf="a conflict"
+[ "$#" -gt 1 ] &&
+ conf="conflicts"
+
+subject="manual merge of the BRANCH tree with the FIXME tree"
+
+$(dirname $0)/message_helper $branch "$subject" <<EOF
+FIXME: Add owner of second tree to To:
+ Add author(s)/SOB of conflicting commits.
+
+Today's linux-next merge of the BRANCH tree got $conf in:
+
+$files
+between commit:
+
+ ("")