t / t5100 / quoted-from.expecton commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3