t / t5100 / quoted-from.expecton commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3