Revision 76afe74b10195c1e9f0c821c7f210da8de152006 authored by Junio C Hamano on 22 January 2015, 21:46:45 UTC, committed by Junio C Hamano on 22 January 2015, 21:46:45 UTC
* js/t1050: t1050-large: generate large files without dd
ll-merge.h
/*
* Low level 3-way in-core file merge.
*/
#ifndef LL_MERGE_H
#define LL_MERGE_H
struct ll_merge_options {
unsigned virtual_ancestor : 1;
unsigned variant : 2; /* favor ours, favor theirs, or union merge */
unsigned renormalize : 1;
long xdl_opts;
};
int ll_merge(mmbuffer_t *result_buf,
const char *path,
mmfile_t *ancestor, const char *ancestor_label,
mmfile_t *ours, const char *our_label,
mmfile_t *theirs, const char *their_label,
const struct ll_merge_options *opts);
int ll_merge_marker_size(const char *path);
#endif
Computing file changes ...