From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Jan 2010 05:30:18 +0000 (-0800)
Subject: xdl_merge(): allow passing down marker_size in xmparam_t
X-Git-Tag: v1.7.0-rc0~53^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9914cf468941067b4f3deb9c69c11af3f5b45ccc?ds=inline;hp=9914cf468941067b4f3deb9c69c11af3f5b45ccc

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>
---