diff options
author | Kevin Ballard <kevin@sb.org> | 2010-09-27 16:58:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:15:56 -0700 |
commit | 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 (patch) | |
tree | 9f51a2c9fabad753a2840f4d33023bed3c8d19c9 /diff.h | |
parent | 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae (diff) | |
download | git-10ae7526bebb505ddddba01f76ec97d5f7b5e0e5.tar.gz |
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 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -301,4 +301,6 @@ extern size_t fill_textconv(struct userdiff_driver *driver, extern struct userdiff_driver *get_textconv(struct diff_filespec *one); +extern int parse_rename_score(const char **cp_p); + #endif /* DIFF_H */ |