aboutsummaryrefslogtreecommitdiff
path: root/t/t6045-merge-rename-delete.sh
Commit message (Expand)AuthorAge
* merge-recursive: make "CONFLICT (rename/delete)" message show both pathsMatt McCutchen2017-01-30
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 17:15:58 +0000