Johannes Schindelin 710daa83fc xdl_merge(): fix thinko ... If one side's block (of changed lines) ends later than the other side's block, the former should be tested against the next block of the other side, not vice versa. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>		2006-12-02 17:28:19 -08:00
..
xdiff.h	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xdiffi.c	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xdiffi.h	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xemit.c	Increase length of function name buffer	2006-11-23 22:51:41 -08:00
xemit.h	Use a *real* built-in diff generator	2006-03-25 16:49:58 -08:00
xinclude.h	xdiff: Show function names in hunk headers.	2006-03-27 18:43:51 -08:00
xmacros.h	Fix hash function in xdiff library	2006-10-16 21:27:44 -07:00
xmerge.c	xdl_merge(): fix thinko	2006-12-02 17:28:19 -08:00
xprepare.c	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00
xprepare.h	Use a *real* built-in diff generator	2006-03-25 16:49:58 -08:00
xtypes.h	Use a *real* built-in diff generator	2006-03-25 16:49:58 -08:00
xutils.c	diff: fix 2 whitespace issues	2006-10-12 09:30:14 -07:00
xutils.h	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00