Merge branch 'jc/cherry'

diff --git a/xdiff-interface.h b/xdiff-interface.h
index ec682a297108dc0a58203019693c1a1c4b0a91e1..1918808081c00daf20a16a1592c0ed9be6d79be4 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -15,7 +15,8 @@ struct xdiff_emit_state {
 
 int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
 int parse_hunk_header(char *line, int len,
-                     unsigned int *ob, unsigned int *on,
-                     unsigned int *nb, unsigned int *nn);
+                     int *ob, int *on,
+                     int *nb, int *nn);
+int read_mmfile(mmfile_t *ptr, const char *filename);
 
 #endif