Submodules: Use "ignore" settings from .gitmodules too for diff and status

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d091ede134d42406291989c49553f7428..57754cc8ca7b378a86b168a4fd6299fa3dfba045 100644 (file)
--- 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