t / t5100 / quoted-from.expecton commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3