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