summaryrefslogtreecommitdiff
path: root/t/t6425-merge-rename-delete.sh
AgeCommit message (Expand)AuthorFilesLines
2020-08-10t6425: be more flexible with rename/delete conflict messagesLibravatar Elijah Newren1-1/+2
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+23