summaryrefslogtreecommitdiff
path: root/t/t6045-merge-rename-delete.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: make "CONFLICT (rename/delete)" message show both pathsmm/merge-rename-delete-messageMatt McCutchen2017-01-301-0/+23