Skip to main content

Browse the archive

Staging
v0.7.0
Revision 6233a5210ef64ba31bbf0e867e03e9176e0aace9 authored by Junio C Hamano on 04 May 2008, 01:55:33 UTC, committed by Junio C Hamano on 04 May 2008, 01:55:33 UTC 
Merge branch 'maint-1.5.4' into maint
 
* maint-1.5.4:
  filter-branch: Documentation fix.
2 parent s 2788631 + a174889
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 virtual_ancestor);

#endif
back to top