From: Elijah Newren <newren@gmail.com>
Date: Mon, 31 Mar 2025 18:14:43 GMT
Subject: Re: [PATCH 7/8] tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
Message-ID: <CABPp-BEm-RH0N0bxtfp0yvaqbuiqFPBEQEuzWYov2Qv7+8X7qA@mail.gmail.com>
In-Reply-To: <CAPig+cSJ-3CXLV3dEhN+B8k7COQNW1Zm2ynuZtmmspzXsjp_PA@mail.gmail.com>

On Mon, Mar 31, 2025 at 10:34 AM Eric Sunshine <sunshine@sunshineco.com> wrote:
>
> On Mon, Mar 31, 2025 at 11:55 AM Elijah Newren via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> > Both of these existed to allow use to reuse all the merge-related tests
>
> s/use/us/

Indeed, thanks!

> > in the testsuite while easily flipping between the 'recursive' and the
> > 'ort' backends.  Now that we have removed merge-recursive and remapped
> > 'recursive' to mean 'ort', we don't need this scaffolding anymore.
> >
> > Signed-off-by: Elijah Newren <newren@gmail.com>