Skip to main content

Browse the archive

Staging
v0.5.1
Revision cd46259ebf2e624bcee2aaae05c36663d414e1a2 authored by Junio C Hamano on 11 October 2012, 18:18:56 UTC, committed by Junio C Hamano on 11 October 2012, 18:18:56 UTC 
Git 1.8.0-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c5fe239
Raw File
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