Andrew's git / gitweb.git / diff
?
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)
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>
No differences found