Revision ef687dbd9da6e44ffcfeef3216b531d22d5e43d4 authored by Junio C Hamano on 17 May 2016, 21:38:33 UTC, committed by Junio C Hamano on 17 May 2016, 21:38:33 UTC
Switching between 'master' and 'next', between which the paths to test helper binaries have changed, did not update bin-wrappers/* scripts used in tests, causing false test failures. * nd/test-helpers: wrap-for-bin.sh: regenerate bin-wrappers when switching branches
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 ...