Merge branch 'sg/fsck-config-in-doc' into maint

diff --git a/diff.h b/diff.h
index b20cbcc0914250de4921310d16d58ada4acb7984..d5e44baa9640d2917c69ad3463be0228288b98e4 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -169,7 +169,7 @@ struct diff_options {
        const char *prefix;
        int prefix_length;
        const char *stat_sep;
-       long xdl_opts;
+       int xdl_opts;
 
        /* see Documentation/diff-options.txt */
        char **anchors;