Alex Riesen 0d5e6c9781 Ignore merged status of the file-level merge ...

as it is not relevant for whether the result should be written.
Even if no real merge happened, there might be _no_ reason to
rewrite the working tree file. Maybe even more so.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2007-04-26 16:11:39 -07:00

44 KiB

Raw Blame History

View Raw