Move better_branch_name above get_ref in merge-recursive.

diff --git a/xdiff-interface.h b/xdiff-interface.h
index e2f0d661236504ac1b2cfd42f6f998d4db17729c..1918808081c00daf20a16a1592c0ed9be6d79be4 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -14,5 +14,9 @@ struct xdiff_emit_state {
 };
 
 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