merge-recursive: Provide more info in conflict markers with file renames
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:09 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit3c217c077a86d9ae06ed26bb0baa4475d0e28a0e
tree9af76e87c3b3b100fdbf3aa96bda3808b2eb1c5c
parent4f66dade81c2ebc6e1143b6c116960bfcd837067
merge-recursive: Provide more info in conflict markers with file renames

Whenever there are merge conflicts in file contents, we would mark the
different sides of the conflict with the two branches being merged.
However, when there is a rename involved as well, the branchname is not
sufficient to specify where the conflicting content came from.  In such
cases, mark the two sides of the conflict with branchname:filename rather
than just branchname.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6022-merge-rename.sh
t/t6042-merge-rename-corner-cases.sh