summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-27 04:54:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-27 04:54:04 (GMT)
commit329351feeb0c08c835ac4ff05f127fbfe42a78cf (patch)
tree9c6d18cb13544077b05783defd525c7440d7bc68 /diff.h
parent9b1054d93e7e8564d0d9865cb7118cb6e756c74b (diff)
parent37ab5156ae31ec81e3489406f23be6936a2a370c (diff)
downloadgit-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 'diff.h')
-rw-r--r--diff.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 1fd44f5..0083d92 100644
--- a/diff.h
+++ b/diff.h
@@ -315,4 +315,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 */