t / t5100 / quoted-from.expecton commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3