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

Staging
v0.5.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 703f05ad5835cff92b12c29aecf8d724c8c847e2 authored by Junio C Hamano on 30 September 2011, 21:20:57 UTC
Git 1.7.7

Tip revision: 703f05a

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