X-Git-Url: http://rtime.felk.cvut.cz/gitweb/git.git/blobdiff_plain/990169b9b19b2a4e837127c6b8678d6bdf44c609..HEAD:/ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 57889227b..57754cc8c 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -7,7 +7,7 @@
 
 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 flag);