diff options
| author | Kevin Ballard <kevin@sb.org> | 2010-09-28 01:58:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 22:15:56 +0200 |
| commit | 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 (patch) | |
| tree | 9f51a2c9fabad753a2840f4d33023bed3c8d19c9 /merge-recursive.h | |
| parent | merge-recursive: options to ignore whitespace changes (diff) | |
| download | git-10ae7526bebb505ddddba01f76ec97d5f7b5e0e5.tar.xz git-10ae7526bebb505ddddba01f76ec97d5f7b5e0e5.zip | |
merge-recursive: option to specify rename threshold
The recursive merge strategy turns on rename detection but leaves the
rename threshold at the default. Add a strategy option to allow the user
to specify a rename threshold to use.
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index d21b446a1d..54420f1556 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -19,6 +19,7 @@ struct merge_options { int verbosity; int diff_rename_limit; int merge_rename_limit; + int rename_score; int call_depth; struct strbuf obuf; struct string_list current_file_set; |