summaryrefslogtreecommitdiff
path: root/t/t6423-merge-rename-directories.sh
AgeCommit message (Expand)Author
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren
2020-08-10t6423: add an explanation about why one of the tests does not passElijah Newren
2020-08-10t6416, t6423: clarify some comments and fix some typosElijah Newren
2020-08-10t6423: fix test setup for a couple testsElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren