git/xdiff
Junio C Hamano f2b25dd81f xdl_fill_merge_buffer(): separate out a too deeply nested function
This simply moves code around to make a separate function that prepares
a single conflicted hunk with markers into the buffer.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-30 19:41:43 -07:00
..
xdiff.h xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 2008-02-18 00:10:37 -08:00
xdiffi.c Remove unreachable statements 2007-11-15 21:23:47 -08:00
xdiffi.h War on whitespace 2007-06-07 00:04:01 -07:00
xemit.c Per-path attribute based hunk header selection. 2007-07-06 01:20:47 -07:00
xemit.h War on whitespace 2007-06-07 00:04:01 -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_fill_merge_buffer(): separate out a too deeply nested function 2008-08-30 19:41:43 -07:00
xprepare.c War on whitespace 2007-06-07 00:04:01 -07: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 Remove unreachable statements 2007-11-15 21:23:47 -08:00
xutils.h War on whitespace 2007-06-07 00:04:01 -07:00