t / t5100 / msg0011on commit t6036: add a failed conflict detection case with conflicting types (451a3ab)
   1Here comes a commit log message, and
   2its second line is here.