Merge branch 'jc/conflict-marker-size'

[git.git] / xdiff / xdiff.h

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 8a0efed3139fdf2f9dccbc0163e2943d66460a4d..3f6229edbeb21bb1ca0c423d88390f3b5a05b5a2 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -114,9 +114,16 @@ long xdl_mmfile_size(mmfile_t *mmf);
 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
             xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 
+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,
-               xpparam_t const *xpp, int flags, mmbuffer_t *result);
+               xmparam_t const *xmp, int flags, mmbuffer_t *result);
 
 #ifdef __cplusplus
 }