Skip to main content

Browse the archive

Staging
v0.5.1
Revision 4682693e9ccc04252d0fad6f5627fc056abcdbba authored by Junio C Hamano on 06 September 2010, 07:12:04 UTC, committed by Junio C Hamano on 06 September 2010, 07:12:04 UTC 
Merge branch 'maint'
 
* maint:
  tag.c: whitespace breakages fix
  Fix whitespace issue in object.c
  t5505: add missing &&
2 parent s 02377cf + af24059
Raw File
ll-merge.h 
/*
 * Low level 3-way in-core file merge.
 */

#ifndef LL_MERGE_H
#define LL_MERGE_H

#define LL_OPT_VIRTUAL_ANCESTOR	(1 << 0)
#define LL_OPT_FAVOR_MASK	((1 << 1) | (1 << 2))
#define LL_OPT_FAVOR_SHIFT 1
#define LL_OPT_RENORMALIZE	(1 << 3)

static inline int ll_opt_favor(int flag)
{
	return (flag & LL_OPT_FAVOR_MASK) >> LL_OPT_FAVOR_SHIFT;
}

static inline int create_ll_flag(int favor)
{
	return ((favor << LL_OPT_FAVOR_SHIFT) & LL_OPT_FAVOR_MASK);
}

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,
	     int flag);

int ll_merge_marker_size(const char *path);

#endif
back to top