X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore.h;h=dba4f17658e6b3b7e1853ca024f8cfe9eae9c92e;hb=b0d08a504bee17dfc46f761e166ff2c20c59a91a;hp=91d6c631e69a1f628fa65feecab1ee8b1fb73fad;hpb=6c1413a17e38ecd906e186c7679d2db6d016a3cb;p=git.git

diff --git a/diffcore.h b/diffcore.h
index 91d6c631..dba4f176 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  45000 /* maximum for break-merge to happen (75%)*/
+#define DEFAULT_MERGE_SCORE  48000 /* maximum for break-merge to happen (80%)*/
 
 #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