summaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 05:30:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-17 07:45:29 (GMT)
commit9914cf468941067b4f3deb9c69c11af3f5b45ccc (patch)
tree66a3e9f0a9fc5650e406e6d0a8689f407ce55135 /xdiff/xdiff.h
parent00f8f97d30be7992c16bc466532cb591e00314bf (diff)
downloadgit-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/xdiff.h')
-rw-r--r--xdiff/xdiff.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index b265909..22f3913 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -110,8 +110,11 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
typedef struct s_xmparam {
xpparam_t xpp;
+ int marker_size;
} xmparam_t;
+#define DEFAULT_CONFLICT_MARKER_SIZE 7
+
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
mmfile_t *mf2, const char *name2,
xmparam_t const *xmp, int level, mmbuffer_t *result);