Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
[git] / t / t5100 / quoted-from.expect
1 >From the depths of history, we are stuck with the
2 flaky mbox format.
3