Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 665b5819499b4d56a4f49996125cac919e477309..4a44b2404fb36bb01758cc68964799a0438d5933 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -13,6 +13,7 @@
 #include "tree-walk.h"
 #include "sha1-array.h"
 #include "packfile.h"
+#include "object-store.h"
 
 struct batch_options {
        int enabled;