Skip to main content

Browse the archive

Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Raw File
Tip revision: e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d authored by Junio C Hamano on 06 April 2012, 17:47:58 UTC
Git 1.7.10
Tip revision: e8dde3e
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