summaryrefslogtreecommitdiff
path: root/t/t6439-merge-co-error-msgs.sh
AgeCommit message (Expand)Author
2023-02-06builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason
2022-07-23merge: do not abort early if one strategy fails to handle the mergeElijah Newren
2021-02-11tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-08-10Collect merge-related tests to t64xxElijah Newren