blame.c: Properly initialize strbuf after calling, textconv_object()
[git/dscho.git] / ll-merge.h
blob57754cc8ca7b378a86b168a4fd6299fa3dfba045
1 /*
2 * Low level 3-way in-core file merge.
3 */
5 #ifndef LL_MERGE_H
6 #define LL_MERGE_H
8 int ll_merge(mmbuffer_t *result_buf,
9 const char *path,
10 mmfile_t *ancestor, const char *ancestor_label,
11 mmfile_t *ours, const char *our_label,
12 mmfile_t *theirs, const char *their_label,
13 int flag);
15 int ll_merge_marker_size(const char *path);
17 #endif