diff options
Diffstat (limited to 'merge-file.h')
| -rw-r--r-- | merge-file.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/merge-file.h b/merge-file.h new file mode 100644 index 0000000000..9b3b83ac6c --- /dev/null +++ b/merge-file.h @@ -0,0 +1,7 @@ +#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 |