summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-03 12:37:54 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-03 16:31:11 -0800
commit3b0f5e88ee039e96822d7d0127a59d78936c222f (patch)
treea693cdd3c190ebda92faa6cdfdae070b34946f3e /config.c
parenta9d1836b100d988bb292086eeab1ab826b3959f1 (diff)
downloadgit-3b0f5e88ee039e96822d7d0127a59d78936c222f.tar.gz
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>
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions