Merge branch 'jl/read-tree-m-dry-run'

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 0cd4511bf797afb06d2d50024a8834766c12e9e1..49d1116fc34f536ab9358313522a25564dd1f6c3 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -17,6 +17,7 @@ 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);