Merge branch 'js/fmt-merge-msg'

diff --git a/diff.h b/diff.h
index de9de574e78693d27ff911d882030a59407a99d5..d5068af7d16a0905edfeaa24276461c05437f3be 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -46,6 +46,7 @@ struct diff_options {
        int setup;
        int abbrev;
        const char *stat_sep;
+       long xdl_opts;
 
        int nr_paths;
        const char **paths;
@@ -183,4 +184,6 @@ extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 
 extern int run_diff_index(struct rev_info *revs, int cached);
 
+extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
+
 #endif /* DIFF_H */