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