diff options
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 4da052a3ff..3f6229edbe 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -58,6 +58,12 @@ extern "C" { #define XDL_MERGE_ZEALOUS_ALNUM 3 #define XDL_MERGE_LEVEL_MASK 0x0f +/* merge favor modes */ +#define XDL_MERGE_FAVOR_OURS 1 +#define XDL_MERGE_FAVOR_THEIRS 2 +#define XDL_MERGE_FAVOR(flags) (((flags)>>4) & 3) +#define XDL_MERGE_FLAGS(level, style, favor) ((level)|(style)|((favor)<<4)) + /* merge output styles */ #define XDL_MERGE_DIFF3 0x8000 #define XDL_MERGE_STYLE_MASK 0x8000 @@ -108,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 level, mmbuffer_t *result); + xmparam_t const *xmp, int flags, mmbuffer_t *result); #ifdef __cplusplus } |