Merge branch 'jk/parse-config-key-cleanup' into maint

diff --git a/diffcore-delta.c b/diffcore-delta.c
index 2ebedb32d18abb3e50d8b4e4b523cf2f8205a695..ebe70fb068519be86437a11b980d804be0534c75 100644 (file)
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -166,7 +166,6 @@ int diffcore_count_changes(struct diff_filespec *src,
                           struct diff_filespec *dst,
                           void **src_count_p,
                           void **dst_count_p,
-                          unsigned long delta_limit,
                           unsigned long *src_copied,
                           unsigned long *literal_added)
 {