summaryrefslogtreecommitdiffstats
path: root/t/t6406-merge-attr.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-13/+13
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* Merge branch 'en/merge-tests'Junio C Hamano2020-08-201-2/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+207