diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:14 -0700 |
| commit | 170e30d6957e1f7b8d88046ae122f98d57dca988 (patch) | |
| tree | cf0f5ca970783870cbde395b4a99a551dd6bf052 /combine-diff.c | |
| parent | tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm (diff) | |
| download | git-170e30d6957e1f7b8d88046ae122f98d57dca988.tar.gz git-170e30d6957e1f7b8d88046ae122f98d57dca988.zip | |
builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
This environment variable existed to allow the testsuite 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. Remove it from these three builtins.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions