summaryrefslogtreecommitdiff
path: root/diffcore.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-04 09:03:53 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-04 21:26:36 (GMT)
commit4d0f39cecf93222401a81216e5cf2528e8abc6ae (patch)
tree8baa8745a9773e9d24eb9e482047bb9f558f9cca /diffcore.h
parentf5948cfe673ec65c09b926249cc02ab4451243fa (diff)
downloadgit-4d0f39cecf93222401a81216e5cf2528e8abc6ae.zip
git-4d0f39cecf93222401a81216e5cf2528e8abc6ae.tar.gz
git-4d0f39cecf93222401a81216e5cf2528e8abc6ae.tar.bz2
diffcore-break: similarity estimator fix.
This is a companion patch to the previous fix to diffcore-rename. The merging-back process should use a logic similar to what is used there. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diffcore.h')
-rw-r--r--diffcore.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h
index dba4f17..d31b3b4 100644
--- 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 */