Skip to main content

Browse the archive

Staging
v0.5.1
Revision 06214d171b10e9474a0233dbc5187fd6b109ff2a authored by Johannes Schindelin on 12 February 2021, 14:49:50 UTC, committed by Johannes Schindelin on 12 February 2021, 14:49:50 UTC 
Git 2.24.4
 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 92ac04b
Raw File
ll-merge.h 
/*
 * Low level 3-way in-core file merge.
 */

#ifndef LL_MERGE_H
#define LL_MERGE_H

#include "xdiff/xdiff.h"

struct index_state;

struct ll_merge_options {
	unsigned virtual_ancestor : 1;
	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
	unsigned renormalize : 1;
	unsigned extra_marker_size;
	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,
	     struct index_state *istate,
	     const struct ll_merge_options *opts);

int ll_merge_marker_size(struct index_state *istate, const char *path);
void reset_merge_attributes(void);

#endif
back to top