Merge branch 'tr/maint-no-index-fixes' into maint

[git.git] / xdiff / xdiff.h

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 413082e1fdf537d230a0f58940cee7466b965d0e..84fff583e2a6e3411da4260b9af98043fade1e49 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -50,10 +50,16 @@ extern "C" {
 #define XDL_BDOP_CPY 2
 #define XDL_BDOP_INSB 3
 
+/* merge simplification levels */
 #define XDL_MERGE_MINIMAL 0
 #define XDL_MERGE_EAGER 1
 #define XDL_MERGE_ZEALOUS 2
 #define XDL_MERGE_ZEALOUS_ALNUM 3
+#define XDL_MERGE_LEVEL_MASK 0x0f
+
+/* merge output styles */
+#define XDL_MERGE_DIFF3 0x8000
+#define XDL_MERGE_STYLE_MASK 0x8000
 
 typedef struct s_mmfile {
        char *ptr;
@@ -81,6 +87,7 @@ typedef struct s_xdemitconf {
        unsigned long flags;
        find_func_t find_func;
        void *find_func_priv;
+       void (*emit_func)();
 } xdemitconf_t;
 
 typedef struct s_bdiffparam {