t / t5100 / msg0011on commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1Here comes a commit log message, and
   2its second line is here.