Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: l10n
Fetching contributors…

Cannot retrieve contributors at this time

8 lines (5 sloc) 0.175 kb
#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
Jump to Line
Something went wrong with that request. Please try again.