X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore.h;h=7f9889daf375a0c310fddefeffa0bad5f4d1393c;hb=213523f46c51c5e5f1b2623dcb3af822add75caa;hp=12cd816591aa112b5fe6a773cb5ba2acbf9cf96e;hpb=7cb038a692ec0bdc0f442380678e8e87e26d4e68;p=git.git

diff --git a/diffcore.h b/diffcore.h
index 12cd8165..7f9889da 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -18,7 +18,7 @@
 #define MAX_SCORE 60000.0
 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
 #define DEFAULT_BREAK_SCORE  30000 /* minimum for break to happen (50%)*/
-#define DEFAULT_MERGE_SCORE  48000 /* maximum for break-merge to happen (80%)*/
+#define DEFAULT_MERGE_SCORE  45000 /* maximum for break-merge to happen (75%)*/
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
@@ -101,4 +101,10 @@ void diff_debug_queue(const char *, struct diff_queue_struct *);
 #define diff_debug_queue(a,b) do {} while(0)
 #endif
 
+extern int diffcore_count_changes(void *src, unsigned long src_size,
+				  void *dst, unsigned long dst_size,
+				  unsigned long delta_limit,
+				  unsigned long *src_copied,
+				  unsigned long *literal_added);
+
 #endif