Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 6c41b80153a2e4ee347d0e968ee8d0d9abfc8862 authored by Junio C Hamano on 02 April 2008, 17:42:14 UTC, committed by Junio C Hamano on 02 April 2008, 18:13:25 UTC 
GIT 1.5.5-rc3
 
The rate of fixes that trickle in has slowed and we are definitely
getting there.  Hopefully one final round and we will have the final
1.5.5 soon.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent eedb9d9
Raw File
Tip revision: 6c41b80153a2e4ee347d0e968ee8d0d9abfc8862 authored by Junio C Hamano on 02 April 2008, 17:42:14 UTC
GIT 1.5.5-rc3
Tip revision: 6c41b80
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