summaryrefslogtreecommitdiffstats
path: root/t/t6426-merge-skip-unneeded-updates.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* test-lib-functions: remove bug-inducing "diagnostics" helper paramÆvar Arnfjörð Bjarmason2021-02-121-4/+12
* t/: new helper for tests that pass with ort but fail with recursiveElijah Newren2020-10-261-1/+2
* t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren2020-08-111-1/+1
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+770