From: Junio C Hamano Date: Mon, 16 Jan 2006 05:11:30 +0000 (-0800) Subject: GIT 1.0.11 X-Git-Tag: v1.0.11^0 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae4a35261d5d0050445c66171111e46e3fae1edc?hp=e99c2fbdda590b0d5fb5bd89001e6d9df8342564 GIT 1.0.11 --- diff --git a/Makefile b/Makefile index aa89c8bd07..56505b43ce 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 a38acb13e1..12cd816591 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%)*/