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)
commit9914cf4...8941067b4f3deb9c69c11af3f5b45ccc
tree66a3e9f...a9fc5650e406e6d0a8689f407ce55135copy hash to clipboard (tree)
parent00f8f97...30be7992c16bc466532cb591e00314bfcopy hash to clipboard (diff)
xdiff/xdiff.h
xdiff/xmerge.c