builtin-merge.c: allocate correct amount of memory

diff --git a/diffcore.h b/diffcore.h
index cc96c20734bf4184970f5381416637cf6e45ea13..8ae35785fd4439f466620ab9186838e7cb20fa36 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -92,7 +92,6 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
                                        struct diff_filespec *);
 extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
 
-extern void diffcore_pathspec(const char **pathspec);
 extern void diffcore_break(int);
 extern void diffcore_rename(struct diff_options *);
 extern void diffcore_merge_broken(void);