Skip to content
Permalink
fb4c62235f
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

git/merge-file.h

Go to file
 
 
Cannot retrieve contributors at this time
7 lines (5 sloc) 175 Bytes
Raw Blame
#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