t / t5100 / 0002mboxrdon commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1 >From unchanged
   2 From also unchanged
   3no trailing space, no escaping necessary and '>' was intended:
   4>From
   5