2007-12-24 16:36:00 +08:00
|
|
|
/*
|
|
|
|
|
* 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,
|
2010-03-21 08:38:58 +08:00
|
|
|
mmfile_t *ancestor, const char *ancestor_label,
|
2007-12-24 16:36:00 +08:00
|
|
|
mmfile_t *ours, const char *our_label,
|
|
|
|
|
mmfile_t *theirs, const char *their_label,
|
2009-11-26 10:23:55 +08:00
|
|
|
int flag);
|
2007-12-24 16:36:00 +08:00
|
|
|
|
2010-01-17 15:28:46 +08:00
|
|
|
int ll_merge_marker_size(const char *path);
|
|
|
|
|
|
2007-12-24 16:36:00 +08:00
|
|
|
#endif
|
