diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-27 04:54:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-27 04:54:04 (GMT) |
| commit | 329351feeb0c08c835ac4ff05f127fbfe42a78cf (patch) | |
| tree | 9c6d18cb13544077b05783defd525c7440d7bc68 /merge-recursive.h | |
| parent | 9b1054d93e7e8564d0d9865cb7118cb6e756c74b (diff) | |
| parent | 37ab5156ae31ec81e3489406f23be6936a2a370c (diff) | |
| download | git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.zip git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.tar.gz git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.tar.bz2 | |
Merge branch 'kb/merge-recursive-rename-threshold'
* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold
Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt
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 2eb5d1a..c8135b0 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; |