X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=413082e1fdf537d230a0f58940cee7466b965d0e;hb=008442f5e798e511cc0cd5d9443552b0d107d558;hp=c00ddaa6e987407743d2c8877f9ca6e772f89c86;hpb=7468c297fa88f0035dc719e996b93b1404eee6e3;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;