X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=413082e1fdf537d230a0f58940cee7466b965d0e;hb=ee95ec5d58d536243966de6ee810d345074b755e;hp=c00ddaa6e987407743d2c8877f9ca6e772f89c86;hpb=f407f14deaa14ebddd0d27238523ced8eca74393;p=git.git diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index c00ddaa6e..413082e1f 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -53,6 +53,7 @@ extern "C" { #define XDL_MERGE_MINIMAL 0 #define XDL_MERGE_EAGER 1 #define XDL_MERGE_ZEALOUS 2 +#define XDL_MERGE_ZEALOUS_ALNUM 3 typedef struct s_mmfile { char *ptr;