Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: e09e4024a070e666ed40b66442e8151b91d623e4 authored by Junio C Hamano on 11 September 2012, 18:18:48 UTC
Git 1.7.11.6
Tip revision: e09e402
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