Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 1346908bea31319aabeabdfd955e2ea9aab37456..536f4e4d9784e0e5ffdc108a5be4bf758d1578ba 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -17,5 +17,7 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
 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);
+int buffer_is_binary(const char *ptr, unsigned long size);
 
 #endif