rerere: honor conflict-marker-size attribute

[git.git] / ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d091ede134d42406291989c49553f7428..ff5d84a345848ff34e068c6fad617f2df5633745 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 virtual_ancestor);
 
+int ll_merge_marker_size(const char *path);
+
 #endif