Junio C Hamano 3b0f5e88ee combine-diff: special case --unified=0 ...

Even when --unified=0 is given, the main loop to show the
combined textual diff needs to handle a line that is unchanged
but has lines that were deleted relative to a parent before it
(because that is where the lost lines hang).  However, such a
line should not be emitted in the final output.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2007-02-03 16:31:11 -08:00

26 KiB

Raw Blame History

View Raw