summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-16 05:11:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-16 05:11:30 (GMT)
commitae4a35261d5d0050445c66171111e46e3fae1edc (patch)
treed6ec75534dcfa9e615caa2952acf8226524f7860
parente99c2fbdda590b0d5fb5bd89001e6d9df8342564 (diff)
parentee3d299e93450586d12f099913261ec22849365a (diff)
downloadgit-ae4a35261d5d0050445c66171111e46e3fae1edc.zip
git-ae4a35261d5d0050445c66171111e46e3fae1edc.tar.gz
git-ae4a35261d5d0050445c66171111e46e3fae1edc.tar.bz2
GIT 1.0.11v1.0.11
-rw-r--r--Makefile2
-rw-r--r--diffcore.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index aa89c8b..56505b4 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ all:
# Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-cache perspective.
-GIT_VERSION = 1.0.10
+GIT_VERSION = 1.0.11
# CFLAGS and LDFLAGS are for the users to override from the command line.
diff --git a/diffcore.h b/diffcore.h
index a38acb1..12cd816 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -15,7 +15,7 @@
* 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%)*/