summaryrefslogtreecommitdiff
path: root/t/t6436-merge-overwrite.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: remove leftover untracked filesElijah Newren2021-09-121-1/+2
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-2/+2
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-2/+2
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t6423, t6436: note improved ort handling with dirty filesElijah Newren2020-10-261-5/+13
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+195