One more thing... On Fri, Mar 19, 2021 at 6:09 AM Derrick Stolee <stolee@xxxxxxxxx> wrote: > > On 3/17/2021 5:27 PM, Elijah Newren via GitGitGadget wrote: ^^^ Note: 18 hours, 42 minutes difference. > > This series depends on ort-perf-batch-10[1], and obsoletes the ort-remainder > > topic[2] (that hadn't been picked up yet, so hopefully this doesn't cause > > any confusion) > > > > With this series, merge-ort is ready for general usage -- it passes all > > tests, passes dozens of tests that don't under merge-recursive, and > > merge-ort is is already significantly faster than merge-recursive when > > rename detection is involved. Users can select merge-ort 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. > > > > Changes since v1: > > > > * subsumed the ort-remainder topic (the first 10 patches), which has > > already been reviewed by both Ævar and Stolee[2]. > > * the next two patches were the original v1, reviewed by Stolee > > * the final patch is new and adds testing. > > Sorry for the delay in looking at this. Delay?!? You only took a day and a half to respond! That's a fast turnaround, not a delay. Don't apologize for that, or you'll set unreasonably high expectations that'll scare the rest of us away. :-) Thanks for all your review efforts; it's very much appreciated!
