| commit | 74aabf41cee31f7937f9445a99597403da50585b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2017 21:57:12 +0000 (27 13:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2017 21:57:12 +0000 (27 13:57 -0800) | ||
| tree | 81e01ccab8c3c2624e14a28558e0b942c77afcf6 | treesnapshot (tar.gz zip) |
| parent | 3ad8b5bf26362ac67c9020bf8c30eee54a84f56d | commitdiff |
| parent | b26d87f2da22a5970b15bebe588bcd6ccac98e9b | commitdiff |
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
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
| merge-recursive.c | diff1 | diff2 | blobhistory |