summaryrefslogtreecommitdiff
path: root/t/t6045-merge-rename-delete.sh
AgeCommit message (Expand)AuthorFilesLines
2017-01-30merge-recursive: make "CONFLICT (rename/delete)" message show both pathsLibravatar Matt McCutchen1-0/+23