summaryrefslogtreecommitdiffstats
path: root/t/t6425-merge-rename-delete.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6425: be more flexible with rename/delete conflict messagesElijah Newren2020-08-111-1/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+23