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

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index bf01e05808313da20ed73c37d0d150c4ddb45587..8a8d579752050487269bcc63aac4713c0b8ebc1e 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "tree-walk.h"
 #include "xdiff-interface.h"
+#include "object-store.h"
 #include "blob.h"
 #include "exec-cmd.h"
 #include "merge-blobs.h"