Revision a452d148d10a89ae502bc4755c191ab323227ce5 authored by Junio C Hamano on 26 August 2011, 04:00:46 UTC, committed by Junio C Hamano on 26 August 2011, 04:00:46 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 284daf2
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...