refactor merge_bases() as preparation to libify merge-base

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 4fc597c59421b7558e0beb0f2994e15950592aaa..d5068af7d16a0905edfeaa24276461c05437f3be 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -32,7 +32,8 @@ struct diff_options {
                 full_index:1,
                 silent_on_remove:1,
                 find_copies_harder:1,
-                summary:1;
+                summary:1,
+                color_diff:1;
        int context;
        int break_opt;
        int detect_rename;
@@ -45,6 +46,7 @@ struct diff_options {
        int setup;
        int abbrev;
        const char *stat_sep;
+       long xdl_opts;
 
        int nr_paths;
        const char **paths;
@@ -182,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 */