t / t5100 / msg0018on commit t6036: add a failed conflict detection case with conflicting types (451a3ab)
   1a commit message
   2