t / t5100 / msg0011on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Here comes a commit log message, and
   2its second line is here.