Skip to main content

Browse the archive

Revision 4ac23f375f144d06d66d04a5e5323388d6f53251 authored by Junio C Hamano on 08 March 2010, 08:35:58 UTC, committed by Junio C Hamano on 08 March 2010, 08:35:58 UTC 
Merge branch 'maint-1.6.6' into maint
 
* maint-1.6.6:
2 parent s 97222d9 + c214f2c
Raw File
ll-merge.h 
/*
 * Low level 3-way in-core file merge.
 */

#ifndef LL_MERGE_H
#define LL_MERGE_H

int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
	     mmfile_t *ancestor,
	     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