admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge, sequencer: switch recursive merges over to ort

Browse Source 
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>
This commit is contained in:
Elijah Newren
2025-04-08 15:48:39 +00:00
committed by Junio C Hamano
parent f7ca9bbea6
commit 75cd9ae05f
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7615-diff-algo-with-mergy-operations.sh
View File

@@ -22,8 +22,6 @@ test_expect_success 'setup' '
git tag c2
'
GIT_TEST_MERGE_ALGORITHM=recursive
test_expect_success 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' '
git reset --hard c1 &&
test_must_fail git merge -s recursive -Xdiff-algorithm=myers c2