From 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 27 Sep 2010 16:58:25 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- diff.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 063d10ac2..dbd50961f 100644 --- a/diff.h +++ b/diff.h @@ -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 */ -- cgit v1.2.1