Merge branch 'jc/conflict-marker-size'

[thirdparty/git.git] / ll-merge.h

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