]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 259490e) | patch
Add testing with merge-ort merge strategy
authorElijah Newren <newren@gmail.com>
Sat, 20 Mar 2021 00:03:56 +0000 (00:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2021 19:35:40 +0000 (12:35 -0700)
commitf3b964a07ef70eee6bacefd1ed5f94eb871be902
treeca830b0647420ea4da668b0d462fb54620f31977tree
parent259490e572b630c15c882d964b146424cc26614dcommit | diff
Add testing with merge-ort merge strategy

In preparation for switching from merge-recursive to merge-ort as the
default strategy, have the testsuite default to running with merge-ort.
Keep coverage of the recursive backend by having the linux-gcc job run
with it.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ci/run-build-and-tests.sh diff | blob | blame | history
t/test-lib.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.