Change xdl_merge to generate output even for null merges

diff --git a/xdiff-interface.h b/xdiff-interface.h
index ec682a297108dc0a58203019693c1a1c4b0a91e1..33cab9dd59336fabe8cdd484953544b505c1ba94 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -13,9 +13,14 @@ struct xdiff_emit_state {
        unsigned long remainder_size;
 };
 
+int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 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);
+int buffer_is_binary(const char *ptr, unsigned long size);
+
+extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
 
 #endif