c3ebf18eb2
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()
|
||
|---|---|---|
| .. | ||
| config | ||
| util | ||
| check-directional-formatting.bash | ||
| check-unsafe-assertions.sh | ||
| check-whitespace.sh | ||
| install-dependencies.sh | ||
| install-sdk.ps1 | ||
| lib.sh | ||
| make-test-artifacts.sh | ||
| mount-fileshare.sh | ||
| print-test-failures.sh | ||
| run-build-and-minimal-fuzzers.sh | ||
| run-build-and-tests.sh | ||
| run-static-analysis.sh | ||
| run-style-check.sh | ||
| run-test-slice.sh | ||
| test-documentation.sh | ||