From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mon, 31 Mar 2025 17:34:09 GMT
Subject: Re: [PATCH 7/8] tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
Message-ID: <CAPig+cSJ-3CXLV3dEhN+B8k7COQNW1Zm2ynuZtmmspzXsjp_PA@mail.gmail.com>
In-Reply-To: <0b6bcd225dc1444f4debe5fb8c499c6cad0a4ab2.1743436280.git.gitgitgadget@gmail.com>

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/

> 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>