aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6437-submodule-merge.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-45/+20
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-02-26merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain1-7/+7
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano1-1/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-1/+1
2023-10-03merge: free result of repo_get_merge_bases()Jeff King1-0/+1
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-4/+4
2022-08-04submodule merge: update conflict error messageCalvin Wan1-6/+72
2022-06-22merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren1-1/+1
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan1-0/+3
2021-03-20t: mark several submodule merging tests as fixed under merge-ortElijah Newren1-2/+3
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-8/+8
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26merge tests: expect slight differences in output for recursive vs. ortElijah Newren1-4/+21
2020-08-19Merge branch 'en/merge-tests'Junio C Hamano1-0/+455
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+455
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 03:27:32 +0000