Elijah Newren bfbd201e39 tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm ...

Both of these existed to allow us to reuse all the merge-related tests
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2025-04-08 13:59:13 -07:00

3.3 KiB

Executable File

Raw Permalink Blame History

View Raw