X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=diff.h;h=4fc597c59421b7558e0beb0f2994e15950592aaa;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=70077c6ed938848ba260672f8271a99ecfe9b0a3;hpb=4bbd261bbd941066735e41dff0ade9f50e6fe84d;p=git.git

diff --git a/diff.h b/diff.h
index 70077c6e..4fc597c5 100644
--- a/diff.h
+++ b/diff.h
@@ -33,6 +33,7 @@ struct diff_options {
 		 silent_on_remove:1,
 		 find_copies_harder:1,
 		 summary:1;
+	int context;
 	int break_opt;
 	int detect_rename;
 	int line_termination;
@@ -43,6 +44,7 @@ struct diff_options {
 	int rename_limit;
 	int setup;
 	int abbrev;
+	const char *stat_sep;
 
 	int nr_paths;
 	const char **paths;
@@ -51,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,
@@ -152,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*);