mirror of
https://github.com/git/git.git
synced 2024-05-04 14:46:39 +02:00
18 lines
349 B
C
18 lines
349 B
C
/*
|
|
* Low level 3-way in-core file merge.
|
|
*/
|
|
|
|
#ifndef LL_MERGE_H
|
|
#define LL_MERGE_H
|
|
|
|
int ll_merge(mmbuffer_t *result_buf,
|
|
const char *path,
|
|
mmfile_t *ancestor,
|
|
mmfile_t *ours, const char *our_label,
|
|
mmfile_t *theirs, const char *their_label,
|
|
int virtual_ancestor);
|
|
|
|
int ll_merge_marker_size(const char *path);
|
|
|
|
#endif
|