Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 3e53891f85c58b4adb016a429a1f3b7fae78ca03 authored by Junio C Hamano on 10 December 2012, 21:05:47 UTC
Git 1.8.0.2
Tip revision: 3e53891
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