t / t5100 / msg0011on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1Here comes a commit log message, and
   2its second line is here.