Skip to main content

Browse the archive

Staging
v0.5.1
Revision f7d958dff5e194797ef6776bcc77c1349f9f8c81 authored by Junio C Hamano on 24 October 2011, 04:48:06 UTC, committed by Junio C Hamano on 24 October 2011, 04:48:06 UTC 
Git 1.7.7.1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7fe74f5
Raw File
merge-file.h 
#ifndef MERGE_FILE_H
#define MERGE_FILE_H

extern void *merge_file(const char *path, struct blob *base, struct blob *our,
			struct blob *their, unsigned long *size);

#endif
back to top