Merge branch 'sb/format-patch-base-patch-id-fix'

diff --git a/diff.h b/diff.h
index de24a048649e14cf93fc075fca45d98e3dc357d7..b680b377b2f5871ecb3a27856f8d15fe2b1c8621 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;