summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+108