diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 05:30:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 07:45:29 (GMT) |
| commit | 9914cf468941067b4f3deb9c69c11af3f5b45ccc (patch) | |
| tree | 66a3e9f0a9fc5650e406e6d0a8689f407ce55135 /xdiff/xemit.c | |
| parent | 00f8f97d30be7992c16bc466532cb591e00314bf (diff) | |
| download | git-9914cf468941067b4f3deb9c69c11af3f5b45ccc.zip git-9914cf468941067b4f3deb9c69c11af3f5b45ccc.tar.gz git-9914cf468941067b4f3deb9c69c11af3f5b45ccc.tar.bz2 | |
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>
Diffstat (limited to 'xdiff/xemit.c')
0 files changed, 0 insertions, 0 deletions