diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:12 -0700 |
| commit | 75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f (patch) | |
| tree | ab2fae9df47029052aacb0896470de260c86d66a /t/t7615-diff-algo-with-mergy-operations.sh | |
| parent | f7ca9bbea6de24ff375bfba38c536b0a89474900 (diff) | |
| download | git-75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f.tar.gz | |
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>
Diffstat (limited to 't/t7615-diff-algo-with-mergy-operations.sh')
| -rwxr-xr-x | t/t7615-diff-algo-with-mergy-operations.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t7615-diff-algo-with-mergy-operations.sh b/t/t7615-diff-algo-with-mergy-operations.sh index ac5863e788..5822d02d51 100755 --- a/t/t7615-diff-algo-with-mergy-operations.sh +++ b/t/t7615-diff-algo-with-mergy-operations.sh @@ -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 |