diff --git a/ll-merge.h b/ll-merge.h
index aaed46dec9dabcd7adc614ded30086f61cdf7b48..57889227b1782d3792be2046fbb54bca67b779de 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
mmfile_t *theirs, const char *their_label,
int flag);
+int ll_merge_marker_size(const char *path);
+
#endif