Commit hook doesn't deal well with #Please explain comments #16861
Description
When doing a forward merge, if you leave a comment block immediately after the "fixed ... in ..." message then it ends up on the end of the rewritten message.