Content - 9b3b83ac6c262c313db8a85fd3f7e83564d94186 - 2f09fea/merge-file.h

visit type:

Tip revision: e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d authored by Junio C Hamano on 06 April 2012, 17:47:58 UTC
Git 1.7.10

Tip revision: e8dde3e

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