summaryrefslogtreecommitdiffstats
path: root/t/t6436-merge-overwrite.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* merge: fix leaking merge basesPatrick Steinhardt2024-06-111-0/+1
* tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano2023-11-021-2/+2
* tests: remove leftover untracked filesElijah Newren2021-09-131-1/+2
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-111-2/+2
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-2/+2
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* t6423, t6436: note improved ort handling with dirty filesElijah Newren2020-10-261-5/+13
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+195