Revision 212d781c967317a05a704609ddf3ffc8a09f8590 authored by Junio C Hamano on 26 August 2014, 18:16:25 UTC, committed by Junio C Hamano on 26 August 2014, 18:16:25 UTC
Fix profile-feedback build broken in 2.1 for tarball releases. * jk/fix-profile-feedback-build: Makefile: make perf tests optional for profile build
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...