[PATCH] The diff-raw format updates.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 7b9f37d..1fc8469 100644 (file)
--- 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 *);