Junio C Hamano 9914cf4689 xdl_merge(): allow passing down marker_size in xmparam_t ...

This allows the callers of xdl_merge() to pass marker_size (defaults to 7)
in xmparam_t argument, to use conflict markers of non-default length.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-01-16 23:45:29 -08:00

..

xdiff.h

xdl_merge(): allow passing down marker_size in xmparam_t

2010-01-16 23:45:29 -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(): allow passing down marker_size in xmparam_t

2010-01-16 23:45:29 -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