X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=diff.h;h=4fc597c59421b7558e0beb0f2994e15950592aaa;hp=3027974c1ec74217a58345b4ab48e673ee3db710;hb=HEAD;hpb=18b01f4ff6db66b6419c7501bb303b643638b297 diff --git a/diff.h b/diff.h index 3027974c..4fc597c5 100644 --- a/diff.h +++ b/diff.h @@ -44,6 +44,7 @@ struct diff_options { int rename_limit; int setup; int abbrev; + const char *stat_sep; int nr_paths; const char **paths; @@ -52,6 +53,8 @@ struct diff_options { add_remove_fn_t add_remove; }; +extern const char mime_boundary_leader[]; + extern void diff_tree_setup_paths(const char **paths, struct diff_options *); extern void diff_tree_release_paths(struct diff_options *); extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, @@ -153,6 +156,7 @@ extern int diff_queue_is_empty(void); #define DIFF_FORMAT_NAME 4 #define DIFF_FORMAT_NAME_STATUS 5 #define DIFF_FORMAT_DIFFSTAT 6 +#define DIFF_FORMAT_CHECKDIFF 7 extern void diff_flush(struct diff_options*);