t / t5100 / 0001mboxrdon commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1From the beginning, mbox should have been mboxrd
   2>From escaped
   3From not mangled but this line should have been escaped
   4