Skip to main content

Browse the archive

Staging
v0.5.1
Revision 5f4d133fca7eb3cb750f056a6fd0281ba06cd12f authored by Junio C Hamano on 06 January 2012, 20:41:39 UTC, committed by Junio C Hamano on 06 January 2012, 20:41:39 UTC 
Git 1.7.8.3
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b15840e
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