Make git-pull complain and give advice when there is nothing to merge with

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 536f4e4d9784e0e5ffdc108a5be4bf758d1578ba..fb742dbb6ba2125b970b9d9510e208ec99954a2d 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -20,4 +20,6 @@ int parse_hunk_header(char *line, int len,
 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);
+
 #endif