GIT 1.0.11

diff --git a/Makefile b/Makefile
index aa89c8bd0776614faef67cc845dae047ed048930..56505b43ce30d948e79232177141351aa51ad383 100644 (file)
--- 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 a38acb13e19e0b3bfe9a377fefe4810c9830a11e..12cd816591aa112b5fe6a773cb5ba2acbf9cf96e 100644 (file)
--- 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%)*/