Skip to main content

Browse the archive

Staging
v0.5.1
Revision 0e2d57fd50f61e668be3180bc8f25991ea88aa8c authored by Junio C Hamano on 14 March 2012, 22:38:47 UTC, committed by Junio C Hamano on 14 March 2012, 22:47:45 UTC 
Git 1.7.10-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent d973dc0
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