completion: add --continue option for merge

diff --git a/diffcore.h b/diffcore.h
index c11b8465fc8ef9e54f12130e490c00bd2fb63616..623024135478088028cd42b8c6a744ebb04bf0a7 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -142,7 +142,6 @@ extern 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);