summaryrefslogtreecommitdiff
path: root/t/t6400-merge-df.sh
AgeCommit message (Expand)Author
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren
2020-10-08tests: avoid using the branch name `main`Johannes Schindelin
2020-08-10Collect merge-related tests to t64xxElijah Newren