X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diffcore.h;h=91d6c631e69a1f628fa65feecab1ee8b1fb73fad;hb=6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1;hp=12cd816591aa112b5fe6a773cb5ba2acbf9cf96e;hpb=ae4a35261d5d0050445c66171111e46e3fae1edc;p=git.git diff --git a/diffcore.h b/diffcore.h index 12cd8165..91d6c631 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 */