Skip to main content

Browse the archive

Revision 27ac2b1f24d034f89e87d79768fe94a4e7559b93 authored by Junio C Hamano on 14 March 2014, 21:27:23 UTC, committed by Junio C Hamano on 14 March 2014, 21:27:23 UTC 
Merge branch 'ta/parse-commit-with-skip-prefix'
 
* ta/parse-commit-with-skip-prefix:
  commit.c: use skip_prefix() instead of starts_with()
2 parent s e8cb499 + 147972b
Raw File
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
back to top