Staging
v0.5.1
https://github.com/git/git
Revision eac2d83247ea0a265d923518c26873bb12c33778 authored by Junio C Hamano on 06 January 2012, 20:48:17 UTC, committed by Junio C Hamano on 06 January 2012, 20:51:09 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5de89d3
Raw File
Tip revision: eac2d83247ea0a265d923518c26873bb12c33778 authored by Junio C Hamano on 06 January 2012, 20:48:17 UTC
Git 1.7.9-rc0
Tip revision: eac2d83
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