| commit | 3b0f5e88ee039e96822d7d0127a59d78936c222f | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 3 Feb 2007 20:37:54 +0000 (3 12:37 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 4 Feb 2007 00:31:11 +0000 (3 16:31 -0800) | ||
| tree | a693cdd3c190ebda92faa6cdfdae070b34946f3e | treesnapshot (tar.gz zip) |
| parent | a9d1836b100d988bb292086eeab1ab826b3959f1 | commitdiff |
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>
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 | diffblobblamehistory |