summaryrefslogtreecommitdiff
path: root/t/t6402-merge-rename.sh
AgeCommit message (Expand)Author
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-10-26merge tests: expect slight differences in output for recursive vs. ortElijah Newren
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren