projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 00f8f97) | patch
xdl_merge(): allow passing down marker_size in xmparam_t
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 05:30:18 +0000 (21:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 07:45:29 +0000 (23:45 -0800)
commit9914cf468941067b4f3deb9c69c11af3f5b45ccc
tree66a3e9f0a9fc5650e406e6d0a8689f407ce55135tree | snapshot
parent00f8f97d30be7992c16bc466532cb591e00314bfcommit | diff
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>
xdiff/xdiff.h diff | blob | history
xdiff/xmerge.c diff | blob | history
Git—the stupid content tracker