summaryrefslogtreecommitdiffstats
path: root/t/t6406-merge-attr.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/merge-tests'Junio C Hamano2020-08-201-2/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+207