Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: ee26a6e2b87905ac605c27841f607cb3379ca678 authored by Junio C Hamano on 03 December 2012, 17:49:51 UTC
Git 1.8.1-rc0
Tip revision: ee26a6e
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