diff options
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 3 |
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); |