X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=deebe02cd3489ef3ce94b407ff9c3de4c21a0eb1;hb=d5c527448db30be55553e0b125015e8d444f8dbc;hp=413082e1fdf537d230a0f58940cee7466b965d0e;hpb=5c9afcff1aa048abf95296231d51fa481304a735;p=git.git

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 413082e1f..deebe02cd 100644
--- 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;