aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6425-merge-rename-delete.sh
AgeCommit message (Expand)AuthorFilesLines
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-2/+2
2022-07-27leak tests: mark passing SANITIZE=leak tests as leak-freeÆvar Arnfjörð Bjarmason1-0/+1
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-08-10t6425: be more flexible with rename/delete conflict messagesElijah Newren1-1/+2
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+23