diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-17 10:28:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-17 10:28:18 -0700 |
| commit | c3ebf18eb2deac595bd2550c1076247d8cbf2bc1 (patch) | |
| tree | cbfe05bc8f89b8bde1e37b1a1e9cbfc3089f0f17 /t/t4069-remerge-diff.sh | |
| parent | fe7ae3b87ef866e4818a106e8ce6e3d821ed76d7 (diff) | |
| parent | 170e30d6957e1f7b8d88046ae122f98d57dca988 (diff) | |
| download | git-c3ebf18eb2deac595bd2550c1076247d8cbf2bc1.tar.gz | |
Merge branch 'en/merge-recursive-debug'
Remove remnants of the recursive merge strategy backend, which was
superseded by the ort merge strategy.
* en/merge-recursive-debug:
builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
merge-recursive.[ch]: thoroughly debug these
merge, sequencer: switch recursive merges over to ort
sequencer: switch non-recursive merges over to ort
merge-ort: enable diff-algorithms other than histogram
builtin/merge-recursive: switch to using merge_ort_generic()
checkout: replace merge_trees() with merge_ort_nonrecursive()
Diffstat (limited to 't/t4069-remerge-diff.sh')
| -rwxr-xr-x | t/t4069-remerge-diff.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/t/t4069-remerge-diff.sh b/t/t4069-remerge-diff.sh index c6c94aef14..966882ce91 100755 --- a/t/t4069-remerge-diff.sh +++ b/t/t4069-remerge-diff.sh @@ -4,13 +4,6 @@ test_description='remerge-diff handling' . ./test-lib.sh -# This test is ort-specific -if test "${GIT_TEST_MERGE_ALGORITHM}" != ort -then - skip_all="GIT_TEST_MERGE_ALGORITHM != ort" - test_done -fi - test_expect_success 'setup basic merges' ' test_write_lines 1 2 3 4 5 6 7 8 9 >numbers && git add numbers && |