?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'rs/commit-list-sort-in-batch'
[git/mingw/j6t.git] / merge-file.h
blob9b3b83ac6c262c313db8a85fd3f7e83564d94186
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
Extra changes on top of the MinGW port of git