Junio C Hamano 00f8f97d30 xdl_merge(): introduce xmparam_t for merge specific parameters ... So far we have only needed to be able to pass an option that is generic to xdiff family of functions to this function. Extend the interface so that we can give it merge specific parameters. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-01-16 21:33:13 -08:00
..
xdiff.h	xdl_merge(): introduce xmparam_t for merge specific parameters	2010-01-16 21:33:13 -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	xdl_merge(): introduce xmparam_t for merge specific parameters	2010-01-16 21:33:13 -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