Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: cd46259ebf2e624bcee2aaae05c36663d414e1a2 authored by Junio C Hamano on 11 October 2012, 18:18:56 UTC
Git 1.8.0-rc2
Tip revision: cd46259
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