Revision 1dad5c14f993dcd2d38ce7eb7ecedb624732d692 authored by SZEDER Gábor on 13 June 2012, 08:11:29 UTC, committed by Junio C Hamano on 13 June 2012, 17:24:46 UTC
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9bea2b5
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 ...