Merge branch 'tb/config-default'

diff --git a/merge-blobs.c b/merge-blobs.c
index fa49c17287f4120b4bbb75acc6b92b3d339710cd..fabb8c19ce983962b45c415f66c11236fa906bfe 100644 (file)
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -4,6 +4,7 @@
 #include "ll-merge.h"
 #include "blob.h"
 #include "merge-blobs.h"
+#include "object-store.h"
 
 static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
 {