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

diff --git a/builtin/difftool.c b/builtin/difftool.c
index bc97d4aef2db2d76e3ffddfc4759e52688f3974e..51f6c9cdb460f5d35dc1abc199604ac5fa912dda 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -20,6 +20,7 @@
 #include "argv-array.h"
 #include "strbuf.h"
 #include "lockfile.h"
+#include "object-store.h"
 #include "dir.h"
 
 static char *diff_gui_tool;