t / t5100 / quoted-from.expecton commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3