summaryrefslogtreecommitdiff
path: root/t/t6436-merge-overwrite.sh
AgeCommit message (Expand)Author
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-10-26t6423, t6436: note improved ort handling with dirty filesElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren