Junio C Hamano 53a7085a10 xmerge: make return value from xdl_merge() more usable. ... The callers would want to know if the resulting merge is clean; do not discard that information away after calling xdl_do_merge(). 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	xmerge: make return value from xdl_merge() more usable.	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