]> git.ipfire.org Git - thirdparty/git.git/commit
sequencer: switch non-recursive merges over to ort
authorElijah Newren <newren@gmail.com>
Tue, 8 Apr 2025 15:48:38 +0000 (15:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 20:59:12 +0000 (13:59 -0700)
commitf7ca9bbea6de24ff375bfba38c536b0a89474900
treef82a60f2e16a815e8dfb5f7e6dac2b364ecdf182
parent2e806d8464decacc307cdbfa45c98be8e28382da
sequencer: switch non-recursive merges over to ort

The do_recursive_merge() function, which is somewhat misleadingly named
since its purpose in life is to do a *non*-recursive merge, had code to
allow either using the recursive or ort backends.  The default has been
ort for a very long time, let's just remove the code path for allowing
the recursive backend to be selected.

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