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
Showing
t/t6045-merge-rename-delete.sh
0 → 100755
想要评论请 注册 或 登录