diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
| commit | f3b964a07ef70eee6bacefd1ed5f94eb871be902 (patch) | |
| tree | ca830b0647420ea4da668b0d462fb54620f31977 /refs/ref-cache.c | |
| parent | t6423: mark remaining expected failure under merge-ort as such (diff) | |
| download | tgif-f3b964a07ef70eee6bacefd1ed5f94eb871be902.tar.xz | |
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>
Diffstat (limited to 'refs/ref-cache.c')
0 files changed, 0 insertions, 0 deletions