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

Staging
v0.5.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: bafc478f1618534fcb85bedc0fa224bd2d462441 authored by Junio C Hamano on 15 September 2012, 03:57:23 UTC
Git 1.7.11.7

Tip revision: bafc478

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