Merge branch 'en/ort-readiness'

[thirdparty/git.git] / ci / run-build-and-tests.sh

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index a66b5e8c75aec2e4a9ea80227a8b492c8efcdf8d..d19be40544c8fde49b9405ab170e283c1ad8f97c 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -16,6 +16,7 @@ linux-gcc)
        export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
        make test
        export GIT_TEST_SPLIT_INDEX=yes
+       export GIT_TEST_MERGE_ALGORITHM=recursive
        export GIT_TEST_FULL_IN_PACK_ARRAY=true
        export GIT_TEST_OE_SIZE=10
        export GIT_TEST_OE_DELTA_SIZE=5