Merge branch 'sb/object-store-grafts' into sb/object-store-lookup

diff --git a/merge-recursive.c b/merge-recursive.c
index bed4a5be02404ef512ba5cfcd9bb33ac04a4ca47..0e9f5a62e525cc5cdb4acb88584c7f535d8e0497 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -8,6 +8,7 @@
 #include "advice.h"
 #include "lockfile.h"
 #include "cache-tree.h"
+#include "object-store.h"
 #include "commit.h"
 #include "blob.h"
 #include "builtin.h"