config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index 3de343270f5de35330f9a0b5d6d120c2694738b3..11de52e9e9b0cc67704b56d6579970c95bc28cd7 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -452,11 +452,11 @@ struct combine_diff_path {
                st_mult(sizeof(struct combine_diff_parent), (n)))
 
 void show_combined_diff(struct combine_diff_path *elem, int num_parent,
-                       int dense, struct rev_info *);
+                       struct rev_info *);
 
-void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
+void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev);
 
-void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
+void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);
 
 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);