t / t5100 / 0002mboxrdon commit t6036: add a failed conflict detection case with conflicting types (451a3ab)
   1 >From unchanged
   2 From also unchanged
   3no trailing space, no escaping necessary and '>' was intended:
   4>From
   5