Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 5ad9dce7e691106fecde413de8cc321b937367a6 authored by Junio C Hamano on 08 September 2009, 00:20:02 UTC, committed by Junio C Hamano on 08 September 2009, 00:20:02 UTC 
GIT 1.6.5-rc0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent df01e7c
Raw File
Tip revision: 5ad9dce7e691106fecde413de8cc321b937367a6 authored by Junio C Hamano on 08 September 2009, 00:20:02 UTC
GIT 1.6.5-rc0
Tip revision: 5ad9dce
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