t / t5100 / msg0011on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1Here comes a commit log message, and
   2its second line is here.