Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 authored by Junio C Hamano on 17 June 2012, 21:04:15 UTC
Git 1.7.10.5
Tip revision: 785ee49
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