Merge branch 'tb/config-default'

diff --git a/diff.c b/diff.c
index 639eb646b9fa0f07eaeb20a1f0734c177092806d..dc53a19bab609eac8de52e57f437c79da7fbb1fa 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -13,6 +13,7 @@
 #include "attr.h"
 #include "run-command.h"
 #include "utf8.h"
+#include "object-store.h"
 #include "userdiff.h"
 #include "submodule-config.h"
 #include "submodule.h"