Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: add git-mergetool to the command list.
[gitweb.git]
/
xdiff-interface.h
diff --git
a/xdiff-interface.h
b/xdiff-interface.h
index 1346908bea31319aabeabdfd955e2ea9aab37456..1918808081c00daf20a16a1592c0ed9be6d79be4 100644
(file)
--- a/
xdiff-interface.h
+++ b/
xdiff-interface.h
@@
-17,5
+17,6
@@
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);
#endif