projects
/
git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
blame
|
history
|
raw
|
HEAD
fetch: avoid quadratic loop checking for updated submodules
[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