diff options
Diffstat (limited to 'third_party/git/merge-blobs.h')
| -rw-r--r-- | third_party/git/merge-blobs.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/third_party/git/merge-blobs.h b/third_party/git/merge-blobs.h new file mode 100644 index 000000000000..13cf9669e5b2 --- /dev/null +++ b/third_party/git/merge-blobs.h @@ -0,0 +1,11 @@ +#ifndef MERGE_BLOBS_H +#define MERGE_BLOBS_H + +struct blob; +struct index_state; + +void *merge_blobs(struct index_state *, const char *, + struct blob *, struct blob *, + struct blob *, unsigned long *); + +#endif /* MERGE_BLOBS_H */ |