t / t5100 / quoted-from.expecton commit merge-recursive: rename merge_options argument from 'o' to 'opt' (259ccb6)
   1>From the depths of history, we are stuck with the
   2flaky mbox format.
   3