X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=7a347cf77d448817014ceeaed2d3cd99b5894ac6;hb=b6936205e73c058784288d21d1937e5bba26b91b;hp=101b2b505dcace41754687a427ad0523daaa50a0;hpb=24ad8e0ce23d08d28a5d664ab6164b10125146ce;p=git.git

diff --git a/diff.h b/diff.h
index 101b2b505..7a347cf77 100644
--- a/diff.h
+++ b/diff.h
@@ -29,6 +29,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
 #define DIFF_FORMAT_NUMSTAT	0x0004
 #define DIFF_FORMAT_SUMMARY	0x0008
 #define DIFF_FORMAT_PATCH	0x0010
+#define DIFF_FORMAT_SHORTSTAT	0x0020
 
 /* These override all above */
 #define DIFF_FORMAT_NAME	0x0100
@@ -143,7 +144,9 @@ extern void diff_change(struct diff_options *,
 			const char *base, const char *path);
 
 extern void diff_unmerge(struct diff_options *,
-			 const char *path);
+			 const char *path,
+			 unsigned mode,
+			 const unsigned char *sha1);
 
 extern int diff_scoreopt_parse(const char *opt);