X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.h;h=57754cc8ca7b378a86b168a4fd6299fa3dfba045;hb=ba9523ea809dc496a14f3644bdc1dd6f486983c0;hp=5388422d091ede134d42406291989c49553f7428;hpb=0622f79d8e7e91efc5870afe0ce134e1cee9f9f0;p=git.git

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d0..57754cc8c 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -7,9 +7,11 @@
 
 int ll_merge(mmbuffer_t *result_buf,
 	     const char *path,
-	     mmfile_t *ancestor,
+	     mmfile_t *ancestor, const char *ancestor_label,
 	     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