Skip to main content

Browse the archive

Revision 03969dff8f6ab2e399df7e156c72d5b965388d2f authored by Junio C Hamano on 28 October 2016, 16:01:10 UTC, committed by Junio C Hamano on 28 October 2016, 16:01:10 UTC 
Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint
 
Shorten description of auto-following in "git tag" by removing a
mention of historical remotes layout which is not relevant to the
main topic.

* yk/git-tag-remove-mention-of-old-layout-in-doc:
  doc: remove reference to the traditional layout in git-tag.txt
2 parent s 23415c2 + 749a227
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