Skip to main content

Browse the archive

Staging
v0.5.1
Revision 455cf268dbaf227bdbd5e9fbf96525452bcfe44f authored by Junio C Hamano on 28 March 2012, 17:51:00 UTC, committed by Junio C Hamano on 28 March 2012, 18:18:42 UTC 
Git 1.7.10-rc3
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 65c2b2b
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