From: Junio C Hamano Date: Mon, 27 Feb 2017 21:57:12 +0000 (-0800) Subject: Merge branch 'mm/merge-rename-delete-message' X-Git-Tag: v2.13.0-rc0~176 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/74aabf41cee31f7937f9445a99597403da50585b Merge branch 'mm/merge-rename-delete-message' When "git merge" detects a path that is renamed in one history while the other history deleted (or modified) it, it now reports both paths to help the user understand what is going on in the two histories being merged. * mm/merge-rename-delete-message: merge-recursive: make "CONFLICT (rename/delete)" message show both paths --- 74aabf41cee31f7937f9445a99597403da50585b