Alex Riesen a97e4075a1 Keep rename/rename conflicts of intermediate merges while doing recursive merge ...

This patch leaves the base name in the resulting intermediate tree, to
propagate the conflict from intermediate merges up to the top-level merge.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2007-03-31 13:39:15 -07:00

35 KiB

Raw Blame History

View Raw