projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a9d1836) | patch
combine-diff: special case --unified=0
authorJunio C Hamano <junkio@cox.net>
Sat, 3 Feb 2007 20:37:54 +0000 (12:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Feb 2007 00:31:11 +0000 (16:31 -0800)
commit3b0f5e88ee039e96822d7d0127a59d78936c222f
treea693cdd3c190ebda92faa6cdfdae070b34946f3etree | snapshot
parenta9d1836b100d988bb292086eeab1ab826b3959f1commit | diff
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>
combine-diff.c diff | blob | history
Git—the stupid content tracker