X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=1fc8469cfc2f1463274333c0bebab0e4e495bc6b;hb=81e50eabf06dd68e8e62a9b697eaf60904c58b22;hp=7b9f37d1b8af201fbcf5dcf43b2b1187841dc6c6;hpb=38c6f78059c3060db6f94b24f4a90063a91090d2;p=git.git

diff --git a/diff.h b/diff.h
index 7b9f37d1..1fc8469c 100644
--- a/diff.h
+++ b/diff.h
@@ -15,11 +15,21 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 			     const unsigned char *sha2,
 			     const char *base, const char *path);
 
+extern void diff_guif(unsigned mode1,
+		      unsigned mode2,
+		      const unsigned char *sha1,
+		      const unsigned char *sha2,
+		      const char *path1,
+		      const char *path2);
+
 extern void diff_unmerge(const char *path);
 
 extern int diff_scoreopt_parse(const char *opt);
 
-extern void diff_setup(int reverse, int diff_raw_output);
+#define DIFF_FORMAT_HUMAN   0
+#define DIFF_FORMAT_MACHINE 1
+#define DIFF_FORMAT_PATCH   2
+extern void diff_setup(int reverse, int diff_output_style);
 
 extern void diff_detect_rename(int, int);
 extern void diff_pickaxe(const char *);