Merge branch 'nd/exclude-workaround-top-heavy'

diff --git a/merge-file.c b/merge-file.c
index f7f4533926e35867725db00f0c89522c4b290898..7845528e88eea6a42f914b5bf596473eb33dea40 100644 (file)
--- a/merge-file.c
+++ b/merge-file.c
@@ -3,6 +3,7 @@
 #include "xdiff-interface.h"
 #include "ll-merge.h"
 #include "blob.h"
+#include "merge-file.h"
 
 static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
 {