Skip to main content

Browse the archive

Revision aac1d7b88918f39b1b7c5bc0dcf831dcc9d5d8a8 authored by Andreas Gruenbacher on 13 March 2010, 17:17:04 UTC, committed by Junio C Hamano on 20 March 2010, 16:25:25 UTC 
fetch: Check for a "^{}" suffix with suffixcmp()
 
Otherwise, we will check random bytes for ref names < 3 characters.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e9bd323
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