Staging
v0.5.1
https://github.com/git/git
Revision 8d141a1d562abb31f27f599dbf6e10a6c06ed73e authored by Junio C Hamano on 11 July 2012, 19:55:38 UTC, committed by Junio C Hamano on 11 July 2012, 19:59:41 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b700086
Raw File
Tip revision: 8d141a1d562abb31f27f599dbf6e10a6c06ed73e authored by Junio C Hamano on 11 July 2012, 19:55:38 UTC
Git 1.7.11.2
Tip revision: 8d141a1
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