Merge branch 'jn/makefile-script-lib'

diff --git a/ll-merge.h b/ll-merge.h
index ff5d84a345848ff34e068c6fad617f2df5633745..57889227b1782d3792be2046fbb54bca67b779de 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -10,7 +10,7 @@ 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);