Merge branch 'il/loosen-remote-helper-names'

[git.git] / xdiff-interface.h

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 7352b9a9c204c2b1d4ca9df5ce040fe22d6f521c..abba70c16bb31fae0df999241830d0c8df8bfbb3 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -18,9 +18,11 @@ int parse_hunk_header(char *line, int len,
                      int *ob, int *on,
                      int *nb, int *nn);
 int read_mmfile(mmfile_t *ptr, const char *filename);
+void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
 int buffer_is_binary(const char *ptr, unsigned long size);
 
 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
+extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
 extern int git_xmerge_config(const char *var, const char *value, void *cb);
 extern int git_xmerge_style;