French translation: copy -> copie.
[git/dscho.git] / merge-file.h
blob9b3b83ac6c262c313db8a85fd3f7e83564d94186
1 #ifndef MERGE_FILE_H
2 #define MERGE_FILE_H
4 extern void *merge_file(const char *path, struct blob *base, struct blob *our,
5 struct blob *their, unsigned long *size);
7 #endif