summaryrefslogtreecommitdiff
path: root/t/t6439-merge-co-error-msgs.sh
Commit message (Expand)AuthorAgeFilesLines
* builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason2023-02-061-0/+1
* merge: do not abort early if one strategy fails to handle the mergeElijah Newren2022-07-221-0/+1
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-6/+6
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-4/+4
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+138