gitk --merge -- "$@" &
+tools_dir=$(dirname "$0")
+
printf -v files ' %s\n' "$@"
conf='a conflict'
if [ "$#" -gt 1 ]; then
subject='manual merge of the BRANCH tree with the FIXME tree'
-"$(dirname "$0")/message_helper" "${branch[@]}" "$subject" <<EOF
+"$tools_dir/message_helper" "${branch[@]}" "$subject" <<EOF
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.