Merge branch 'maint-1.6.1' into maint-1.6.2

[git.git] / xdiff / xdiff.h

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index d238c8263eebbbcb83d0d9f551560d86ec4866bb..4da052a3fff6768fca05b2f3399c5d87ec1daa2e 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -85,6 +85,7 @@ typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long
 
 typedef struct s_xdemitconf {
        long ctxlen;
+       long interhunkctxlen;
        unsigned long flags;
        find_func_t find_func;
        void *find_func_priv;