diff-tree: don't print multiple headers for merges when silent.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index cce46491bfa9d3c726c20859459f3ca2d96302ad..7473c522846068b8e4ea3a4f4a62eba239b0e90e 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -17,8 +17,11 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 
 extern void diff_unmerge(const char *path);
 
+extern int diff_scoreopt_parse(const char *opt);
+
 extern void diff_setup(int detect_rename, int minimum_score,
-                      int reverse,
+                      const char *pickaxe,
+                      int reverse, int raw_output,
                       const char **spec, int cnt);
 
 extern void diff_flush(void);