Bert Wesarg cd1d61c44f make union merge an xdl merge favor ... The current union merge driver is implemented as an post process. But the xdl_merge code is quite capable to produce the result by itself. Therefore move it there. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-03-02 11:43:40 -08:00
..
xdiff.h	make union merge an xdl merge favor	2010-03-02 11:43:40 -08:00
xdiffi.c	refactor: use bitsizeof() instead of 8 * sizeof()	2009-07-22 21:57:41 -07:00
xdiffi.h	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xemit.c	Fix various dead stores found by the clang static analyzer	2009-03-15 18:25:24 -07:00
xemit.h	Allow alternate "low-level" emit function from xdl_diff	2008-10-25 12:09:31 -07:00
xinclude.h	War on whitespace	2007-06-07 00:04:01 -07:00
xmacros.h	War on whitespace	2007-06-07 00:04:01 -07:00
xmerge.c	make union merge an xdl merge favor	2010-03-02 11:43:40 -08:00
xpatience.c	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xprepare.c	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xprepare.h	War on whitespace	2007-06-07 00:04:01 -07:00
xtypes.h	War on whitespace	2007-06-07 00:04:01 -07:00
xutils.c	xutils: Fix xdl_recmatch() on incomplete lines	2009-08-23 14:38:43 -07:00
xutils.h	War on whitespace	2007-06-07 00:04:01 -07:00