From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Apr 2025 17:28:18 +0000 (-0700)
Subject: Merge branch 'en/merge-recursive-debug'
X-Git-Tag: v2.50.0-rc0~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3ebf18eb2deac595bd2550c1076247d8cbf2bc1;p=thirdparty%2Fgit.git

Merge branch 'en/merge-recursive-debug'

Remove remnants of the recursive merge strategy backend, which was
superseded by the ort merge strategy.

* en/merge-recursive-debug:
  builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
  tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
  merge-recursive.[ch]: thoroughly debug these
  merge, sequencer: switch recursive merges over to ort
  sequencer: switch non-recursive merges over to ort
  merge-ort: enable diff-algorithms other than histogram
  builtin/merge-recursive: switch to using merge_ort_generic()
  checkout: replace merge_trees() with merge_ort_nonrecursive()
---

c3ebf18eb2deac595bd2550c1076247d8cbf2bc1