t / t5100 / 0001mboxrdon commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1From the beginning, mbox should have been mboxrd
   2>From escaped
   3From not mangled but this line should have been escaped
   4