aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6426-merge-skip-unneeded-updates.sh
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-3/+1
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-05-27builtin/mv: refactor to use `struct strvec`Patrick Steinhardt1-0/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-1/+1
2023-01-14t6426: fix TODO about making test more comprehensiveElijah Newren1-35/+23
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-8/+8
2021-02-12test-lib-functions: remove bug-inducing "diagnostics" helper paramÆvar Arnfjörð Bjarmason1-4/+12
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren1-1/+2
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren1-1/+1
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+770