summaryrefslogtreecommitdiff
path: root/t/t6426-merge-skip-unneeded-updates.sh
Commit message (Expand)AuthorAgeFilesLines
* t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren2020-08-101-1/+1
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+770