1 files changed, 3 insertions, 1 deletions
diff --git a/ll-merge.h b/ll-merge.h
index 5388422..5788922 100644
--- 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