Revision 816f290752cb43c88e31ea1a9e06ec84d559add3 authored by Junio C Hamano on 07 December 2012, 22:18:55 UTC, committed by Junio C Hamano on 07 December 2012, 23:17:21 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 00704e4
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
Computing file changes ...
