X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore.h;h=a38acb13e19e0b3bfe9a377fefe4810c9830a11e;hb=4ddba79db76bd6425f00e99ceb1d82d179319aec;hp=194d40cb4823f294cce67c430fa57520d4bc7ce9;hpb=eeaa4603147974b988d7b958571628d6ecd697f3;p=git.git diff --git a/diffcore.h b/diffcore.h index 194d40cb..a38acb13 100644 --- a/diffcore.h +++ b/diffcore.h @@ -17,7 +17,7 @@ */ #define MAX_SCORE 60000 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */ -#define DEFAULT_BREAK_SCORE 59400 /* minimum for break to happen (99%)*/ +#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/ #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 */ @@ -85,7 +85,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *); extern void diffcore_pathspec(const char **pathspec); extern void diffcore_break(int); -extern void diffcore_rename(int rename_copy, int); +extern void diffcore_rename(struct diff_options *); extern void diffcore_merge_broken(void); extern void diffcore_pickaxe(const char *needle, int opts); extern void diffcore_order(const char *orderfile);