summaryrefslogtreecommitdiff
path: root/t/t6400-merge-df.sh
AgeCommit message (Expand)AuthorFilesLines
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren1-2/+12
2020-10-08tests: avoid using the branch name `main`Libravatar Johannes Schindelin1-4/+4
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+150