X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ll-merge.h;h=57889227b1782d3792be2046fbb54bca67b779de;hb=80eac928ae11d4e417feddcc6a1ec373cf41e14f;hp=5388422d091ede134d42406291989c49553f7428;hpb=f4198c9b7d319a7a595f0d759e7d8094387ab77b;p=git.git

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d0..57889227b 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