diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
| commit | 0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f (patch) | |
| tree | 3266384afc1dc4717f49b1bd77f9ab734cacf8a0 /diffcore.h | |
| parent | Merge branch 'webrick' of git://git.bogomips.org/git-svn (diff) | |
| parent | gitweb: clarify search results page when no matching commit found (diff) | |
| download | git-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.tar.gz git-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.zip | |
Merge branch 'maint'
* maint:
gitweb: clarify search results page when no matching commit found
Documentation: add a FILES section for show-ref
Makefile: add missing dependency on http.h
Makefile: add missing dependencies on url.h
Documentation/git-log: Clarify --full-diff
git-rebase: fix typo when parsing --force-rebase
imap-send: Fix sprintf usage
prune: allow --dry-run for -n and --verbose for -v
notes: allow --dry-run for -n and --verbose for -v
Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
Documentation: cite git-am from git-apply
t7003: fix subdirectory-filter test
Allow "check-ref-format --branch" from subdirectory
check-ref-format: handle subcommands in separate functions
pretty-options.txt: match --format's documentation with implementation.
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index 491bea0b44..fed9b151b5 100644 --- a/diffcore.h +++ b/diffcore.h @@ -18,7 +18,7 @@ #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 36000 /* maximum for break-merge to happen 60%) */ +#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 */ |