aboutsummaryrefslogtreecommitdiff
path: root/t/t6422-merge-rename-corner-cases.sh
AgeCommit message (Expand)Author
2025-12-30merge-ort: fix corner case recursive submodule/directory conflict handlingElijah Newren
2025-06-24test-lib: teach test_seq the -f optionJeff King
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano
2023-01-13t6422: drop commented out codeAndrei Rybak
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren
2022-07-01cat-file: fix a common "struct object_context" memory leakÆvar Arnfjörð Bjarmason
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren
2020-08-10t6422: fix multiple errors with the mod6 test expectationsElijah Newren
2020-08-10t6416, t6422: fix incorrect untracked file countElijah Newren
2020-08-10t6422: fix bad check against missing fileElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 03:33:04 +0000