X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.h;h=57889227b1782d3792be2046fbb54bca67b779de;hb=cf87463e79a3018f666bfc9af113d3eea58a3d82;hp=5388422d091ede134d42406291989c49553f7428;hpb=39a76bdd7de18b2bb2651dcb8136563df41e84f7;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