about summary refs log tree commit diff
path: root/third_party/git/merge-blobs.h
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/merge-blobs.h')
-rw-r--r--third_party/git/merge-blobs.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/third_party/git/merge-blobs.h b/third_party/git/merge-blobs.h
deleted file mode 100644
index 13cf9669e5..0000000000
--- a/third_party/git/merge-blobs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#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 */