summaryrefslogtreecommitdiffstats
path: root/t/t6424-merge-unrelated-index-changes.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6424: make sure a failed merge preserves local changesJunio C Hamano2022-05-191-2/+30
* tests: remove leftover untracked filesElijah Newren2021-09-131-0/+1
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+216