mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Elijah Newren](/assets/img/avatar_default.png)
I looped over the toplevel header files, creating a temporary two-line C program for each consisting of #include "git-compat-util.h" #include $HEADER This patch is the result of manually fixing errors in compiling those tiny programs. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
27 lines
593 B
C
27 lines
593 B
C
/*
|
|
* Low level 3-way in-core file merge.
|
|
*/
|
|
|
|
#ifndef LL_MERGE_H
|
|
#define LL_MERGE_H
|
|
|
|
#include "xdiff/xdiff.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
|