t / t5100 / 0002mboxrdon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1 >From unchanged
   2 From also unchanged
   3no trailing space, no escaping necessary and '>' was intended:
   4>From
   5