X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=91d6c631e69a1f628fa65feecab1ee8b1fb73fad;hb=a369bbfcc080239e523048b033623414a108a3e6;hp=a38acb13e19e0b3bfe9a377fefe4810c9830a11e;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git

diff --git a/diffcore.h b/diffcore.h
index a38acb13e..91d6c631e 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -15,10 +15,10 @@
  * passed around in one int (high 16-bit for merge and low 16-bit
  * for break).
  */
-#define MAX_SCORE 60000
+#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 */