X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=diffcore.h;h=73c7842cc7fd907519016b936a96b6f08cd80b47;hp=7f9889daf375a0c310fddefeffa0bad5f4d1393c;hb=HEAD;hpb=1114b68f25d1d0a0a0a54406ab0cb3e154bdbad9

diff --git a/diffcore.h b/diffcore.h
index 7f9889da..73c7842c 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -17,8 +17,8 @@
  */
 #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_BREAK_SCORE  30000 /* minimum for break to happen (50%) */
+#define DEFAULT_MERGE_SCORE  36000 /* maximum for break-merge to happen 60%) */
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
@@ -26,6 +26,7 @@ struct diff_filespec {
 	unsigned char sha1[20];
 	char *path;
 	void *data;
+	void *cnt_data;
 	unsigned long size;
 	int xfrm_flags;		 /* for use by the xfrm */
 	unsigned short mode;	 /* file mode */
@@ -103,6 +104,8 @@ void diff_debug_queue(const char *, struct diff_queue_struct *);
 
 extern int diffcore_count_changes(void *src, unsigned long src_size,
 				  void *dst, unsigned long dst_size,
+				  void **src_count_p,
+				  void **dst_count_p,
 				  unsigned long delta_limit,
 				  unsigned long *src_copied,
 				  unsigned long *literal_added);