diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-16 22:28:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-16 21:56:39 -0800 |
| commit | 8119214f4e7036cef01a8e13f161ec510b3ff710 (patch) | |
| tree | af9ef47412aaf52ae1dd84c9d13ea17cb5481a7e /t | |
| parent | merge-ort: make clear_internal_opts() aware of partial clearing (diff) | |
| download | tgif-8119214f4e7036cef01a8e13f161ec510b3ff710.tar.xz | |
merge-ort: implement merge_incore_recursive()
Implement merge_incore_recursive(), mostly through the use of a new
helper function, merge_ort_internal(), which itself is based off
merge_recursive_internal() from merge-recursive.c.
This drops the number of failures in the testsuite when run under
GIT_TEST_MERGE_ALGORITHM=ort from around 1500 to 647.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions