On 3/16/2021 12:05 AM, Elijah Newren via GitGitGadget wrote: > This tiny series depends on ort-perf-batch-10[1]. > > If the ort-remainder topic[2] is merged with this series, then the result is > a version of merge-ort ready for general usage. Users can select it by (a) > passing -sort to either git merge or git rebase, or (b) by setting > pull.twohead=ort [3], or (c) by setting GIT_TEST_MERGE_ALGORITHM=ort. Does the other topic add GIT_TEST_MERGE_ALGORITHM=ort to the CI builds? Specifically, the Linux builds have a second run with some optional GIT_TEST_* environment variables. This seems like a nice addition. Other than that extra request, this series was easy to review. LGTM. -Stolee
