tree 76aeba1897c592e1965533a2cb8771671bd747ed
parent a7fa68c5f942706fce5636b9136d1b229e089190
author Junio C Hamano <junkio@cox.net> 1118548520 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1118634019 -0700

[PATCH] Fix rename/copy when dealing with temporarily broken pairs.

When rename/copy uses a file that was broken by diffcore-break
as the source, and the broken filepair gets merged back later,
the output was mislabeled as a rename.  In this case, the source
file ends up staying in the output, so we should label it as a
copy instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>