Staging
v0.5.1
https://github.com/git/git
Revision bddcefc6380bd6629f3f12b5ffd856ec436c6abd authored by Junio C Hamano on 18 January 2012, 23:53:35 UTC, committed by Junio C Hamano on 18 January 2012, 23:53:35 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6e06367
Raw File
Tip revision: bddcefc6380bd6629f3f12b5ffd856ec436c6abd authored by Junio C Hamano on 18 January 2012, 23:53:35 UTC
Git 1.7.9-rc2
Tip revision: bddcefc
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