Skip to main content

Browse the archive

Revision 0d1c285af265459006c012aa4415175c2db961ad authored by Junio C Hamano on 02 February 2015, 20:05:56 UTC, committed by Junio C Hamano on 02 February 2015, 20:05:56 UTC 
Merge git://github.com/git-l10n/git-po
 
* git://github.com/git-l10n/git-po:
  l10n: ca.po: Fix trailing whitespace
2 parent s 15598cf + 7471cf8
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