Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: ed9fe755130891fc878bb2433204faffb534697b authored by Junio C Hamano on 26 November 2012, 02:40:34 UTC
Git 1.8.0.1
Tip revision: ed9fe75
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