X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=diffcore.h;h=dba4f17658e6b3b7e1853ca024f8cfe9eae9c92e;hb=ae64bbc18c80bdad36c53336ba4f724ce128efca;hp=7f9889daf375a0c310fddefeffa0bad5f4d1393c;hpb=0c1fc940eeae051e890304c40d1e66a478afadc8;p=git.git diff --git a/diffcore.h b/diffcore.h index 7f9889da..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 */