diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:13 -0700 |
| commit | bfbd201e39b86028440fc95c47173d8da38e1cd2 (patch) | |
| tree | c656921e7bcc70882ee322122c6f738ce6e6e0f2 /t/t6428-merge-conflicts-sparse.sh | |
| parent | ad45b327c0a13718ed5955319d1e735025676cc8 (diff) | |
| download | git-bfbd201e39b86028440fc95c47173d8da38e1cd2.tar.gz | |
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>
Diffstat (limited to 't/t6428-merge-conflicts-sparse.sh')
| -rwxr-xr-x | t/t6428-merge-conflicts-sparse.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh index 9919c3fa7c..c86e02c6e2 100755 --- a/t/t6428-merge-conflicts-sparse.sh +++ b/t/t6428-merge-conflicts-sparse.sh @@ -23,8 +23,6 @@ test_description="merge cases" # files that might be renamed into each other's paths.) . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-merge.sh - # Testcase basic, conflicting changes in 'numerals' |