Skip to main content

Browse the archive

Revision cc2a7403fef8c3e19e8d5b3939e5a9ee4789fd86 authored by Junio C Hamano on 01 August 2019, 16:10:49 UTC, committed by Junio C Hamano on 01 August 2019, 16:10:50 UTC 
Merge branch 'jc/dir-iterator-test-fix'
 
* jc/dir-iterator-test-fix:
  test-dir-iterator: do not assume errno values
2 parent s a7b27d9 + 9042140
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);

#endif
back to top