Content - 9b3b83ac6c262c313db8a85fd3f7e83564d94186 - da4a398/merge-file.h

visit type:

Tip revision: f7d958dff5e194797ef6776bcc77c1349f9f8c81 authored by Junio C Hamano on 24 October 2011, 04:48:06 UTC
Git 1.7.7.1

Tip revision: f7d958d

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

Browse the archive

https://github.com/git/git