]> git.ipfire.org Git - thirdparty/git.git/blob - merge-file.h
projects / thirdparty / git.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
Merge branch 'jl/maint-fetch-recursive-fix' into maint
[thirdparty/git.git] / merge-file.h
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
Unnamed repository; edit this file 'description' to name the repository.