X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ll-merge.h;h=57754cc8ca7b378a86b168a4fd6299fa3dfba045;hb=452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e;hp=57889227b1782d3792be2046fbb54bca67b779de;hpb=fe7e37235dd9b36402afeccb24bbced933e847d7;p=git.git 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);