Skip to main content

Browse the archive

Revision 66c11f02b031aca6f1756086fefdf4b8a5575c56 authored by Junio C Hamano on 14 December 2011, 05:55:31 UTC, committed by Junio C Hamano on 14 December 2011, 05:55:31 UTC 
Git 1.7.7.5
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c0eb9cc
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