diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:12 -0700 |
| commit | f7ca9bbea6de24ff375bfba38c536b0a89474900 (patch) | |
| tree | f82a60f2e16a815e8dfb5f7e6dac2b364ecdf182 /commit.c | |
| parent | 2e806d8464decacc307cdbfa45c98be8e28382da (diff) | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions