Skip to main content

Browse the archive

Revision a1a031d9356cc89cadc5e14acc4028e3ecc306eb authored by Junio C Hamano on 07 June 2012, 16:14:41 UTC, committed by Junio C Hamano on 07 June 2012, 16:14:41 UTC 
Git 1.7.11-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent dd3d071
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