t / t5100 / info0001on commit t6036: add a failed conflict detection case with conflicting types (451a3ab)
   1Author: A (zzz) U Thor (Comment)
   2Email: a.u.thor@example.com
   3Subject: a commit.
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5