summaryrefslogtreecommitdiff
path: root/t/t6423-merge-rename-directories.sh
AgeCommit message (Expand)AuthorFilesLines
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesLibravatar Elijah Newren1-2/+2
2020-08-10t6423: add an explanation about why one of the tests does not passLibravatar Elijah Newren1-0/+8
2020-08-10t6416, t6423: clarify some comments and fix some typosLibravatar Elijah Newren1-13/+12
2020-08-10t6423: fix test setup for a couple testsLibravatar Elijah Newren1-0/+2
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+4693