Johannes Sixt [off-list ref] writes:
It should behave as if the editor was spawned and the user did not
change the content of the commit message.
...
Contrived? Dunno.
No, just "Sane".
Thanks. And I think Jonathan's original patch is just fine as-is; the
commented verification result should be stripspace()'ed out when we make
the final commit if we do so ourselves, and will stay if the user ends up
having to help resolving the merge.