Blame - merge-file.h - jrn/git

blob: 9b3b83ac6c262c313db8a85fd3f7e83564d94186 [file] [log] [blame]

Ramsay Jones	1e0f8c4	2011-04-07 19:31:24 +0100	[diff] [blame]	1	#ifndef MERGE_FILE_H
				2	#define MERGE_FILE_H
				3
				4	extern void merge_file(const char path, struct blob base, struct blob our,
				5	struct blob their, unsigned long size);
				6
				7	#endif