From bfbd201e39b86028440fc95c47173d8da38e1cd2 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 8 Apr 2025 15:48:41 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- t/test-lib.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 't/test-lib.sh') diff --git a/t/test-lib.sh b/t/test-lib.sh index 9001ed3a64..5952eb56e2 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -544,8 +544,6 @@ GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}" export GIT_DEFAULT_HASH GIT_DEFAULT_REF_FORMAT="${GIT_TEST_DEFAULT_REF_FORMAT:-files}" export GIT_DEFAULT_REF_FORMAT -GIT_TEST_MERGE_ALGORITHM="${GIT_TEST_MERGE_ALGORITHM:-ort}" -export GIT_TEST_MERGE_ALGORITHM # Tests using GIT_TRACE typically don't want : output GIT_TRACE_BARE=1 -- cgit v1.3-5-g9baa