t / t5100 / quoted-from.expecton commit t6036: add a failed conflict detection case with conflicting types (451a3ab)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3