Documentation: receive.denyCurrentBranch defaults to 'refuse'

[git.git] / ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d091ede134d42406291989c49553f7428..57889227b1782d3792be2046fbb54bca67b779de 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -10,6 +10,8 @@ int ll_merge(mmbuffer_t *result_buf,
             mmfile_t *ancestor,
             mmfile_t *ours, const char *our_label,
             mmfile_t *theirs, const char *their_label,
-            int virtual_ancestor);
+            int flag);
+
+int ll_merge_marker_size(const char *path);
 
 #endif