diff options
Diffstat (limited to 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index 5388422d0..ff5d84a34 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -12,4 +12,6 @@ int ll_merge(mmbuffer_t *result_buf, mmfile_t *theirs, const char *their_label, int virtual_ancestor); +int ll_merge_marker_size(const char *path); + #endif |