Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 632052641517de1a965c1f045b97d2eaa541b2e9 authored by Junio C Hamano on 23 September 2011, 21:38:39 UTC
Git 1.7.6.4
Tip revision: 6320526
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