Skip to main content

Browse the archive

Staging
v0.5.1
Revision bc1bbe0c19a6ff39522b4fa3259f34150e308e1f authored by Junio C Hamano on 13 November 2011, 06:14:53 UTC, committed by Junio C Hamano on 13 November 2011, 06:14:53 UTC 
Git 1.7.8-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent dc865af
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