Tree: 07adc43f3a

git/xdiff

History

René Scharfe 6d0e674a57 diff: add option to show context between close hunks ... Merge two hunks if there is only the specified number of otherwise unshown context between them. For --inter-hunk-context=1, the resulting patch has the same number of lines but shows uninterrupted context instead of a context header line in between. Patches generated with this option are easier to read but are also more likely to conflict if the file to be patched contains other changes. This patch keeps the default for this option at 0. It is intended to just make the feature available in order to see its advantages and downsides. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>		16 years ago
..
xdiff.h	diff: add option to show context between close hunks	16 years ago
xdiffi.c	Allow alternate "low-level" emit function from xdl_diff	17 years ago
xdiffi.h	…
xemit.c	diff: add option to show context between close hunks	16 years ago
xemit.h	Allow alternate "low-level" emit function from xdl_diff	17 years ago
xinclude.h	…
xmacros.h	…
xmerge.c	xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less	17 years ago
xprepare.c	xdiff: give up scanning similar lines early	17 years ago
xprepare.h	…
xtypes.h	…
xutils.c	…
xutils.h	…