t / t5100 / quoted-from.expecton commit merge: save merge state earlier (9d89b35)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3