Merge branch 'ew/remote' into next

[git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index dba4f17658e6b3b7e1853ca024f8cfe9eae9c92e..d31b3b476c0fc25a85b483b3d1d04b2d36bc6481 100644 (file)
--- 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  48000 /* maximum for break-merge to happen (80%)*/
+#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 */