]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f7ca9bb) | patch
merge, sequencer: switch recursive merges over to ort
authorElijah Newren <newren@gmail.com>
Tue, 8 Apr 2025 15:48:39 +0000 (15:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 20:59:12 +0000 (13:59 -0700)
commit75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f
treeab2fae9df47029052aacb0896470de260c86d66atree | snapshot
parentf7ca9bbea6de24ff375bfba38c536b0a89474900commit | diff
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>
builtin/merge.c diff | blob | blame | history
sequencer.c diff | blob | blame | history
t/t7615-diff-algo-with-mergy-operations.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.