tools_dir=$(dirname "$0")
hc=()
+mc=()
cc=()
cformat='%(trailers:only=no,valueonly,unfold,key=signed-off-by)%aN <%aE>%n%cN <%cE>'
printf -v subject 'manual merge of the BRANCH tree with the %s tree%s' \
"${hb[*]}" "$hbs"
+read -r -a merge_commits -p 'MERGE_HEAD commit(s): '
+for c in "${merge_commits[@]}"; do
+ if ! git rev-parse --verify "$c" >/dev/null; then
+ printf 'Unknown commit %s\n' "$c"
+ exit 1
+ fi
+ mc+=( "$(git log -1 --format='%h ("%s")' "$c")" )
+ readarray -t -O "${#cc[@]}" cc < <(git log -1 --format="$cformat" "$c" | sort -u)
+done
+mcs=''
+if [ "${#mc[@]}" -gt 1 ]; then
+ mcs='s'
+fi
+
printf -v files ' %s\n' "$@"
conf='a conflict'
if [ "$#" -gt 1 ]; then
$(printf ' %s\n' "${hc[@]}")
-from the ${hb[*]} tree$hbs and commit:
+from the ${hb[*]} tree$hbs and commit$mcs:
- ("")
+$(printf ' %s\n' "${mc[@]}")
from the BRANCH tree.