Re: [PATCH v5 0/4] Beginning of new merge strategy: New API, empty implementation

"Elijah Newren via GitGitGadget" [off-list ref] writes:

In this series, I show the new merge API I have developed in merge-ort, and
show how it differs from that provided by merge-recursive. I do this in four
steps, each corresponding to a patch.

Changes since v4:

 * Fix a bug where 'cherry-pick --continue' would report 'fatal:
   cherry-pick: --strategy cannot be used with --continue' when pull.twohead
   was set to ort (found by user of internal deployment at $DAYJOB)

Will replace.  Thanks.