summaryrefslogtreecommitdiff
path: root/t/t6425-merge-rename-delete.sh
AgeCommit message (Expand)Author
2020-08-10t6425: be more flexible with rename/delete conflict messagesElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren