Skip to main content

Browse the archive

Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Raw File
Tip revision: d9f5ef7a4a760d58f1f824f9fb8c12ef0371d3a9 authored by Junio C Hamano on 26 April 2012, 16:59:22 UTC
Git 1.7.8.6
Tip revision: d9f5ef7
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