Elijah Newren 75cd9ae05f merge, sequencer: switch recursive merges over to ort ...

More precisely, replace calls to merge_recursive() with
merge_ort_recursive().

Also change t7615 to quit calling out recursive; it is not needed
anymore, and we are in fact using ort now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2025-04-08 13:59:12 -07:00

1.8 KiB

Executable File

Raw Blame History

View Raw