Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tree: 16eed7c993
Fetching contributors…

Cannot retrieve contributors at this time

file 7 lines (5 sloc) 0.175 kb
1 2 3 4 5 6 7
#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
Something went wrong with that request. Please try again.