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

diff --git a/builtin/mktree.c b/builtin/mktree.c
index bb76b469fd1f57319f3d202c1e2658d77962d698..2dc4ad6ba8f227a6a8a46bac62048959220411ec 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -7,6 +7,7 @@
 #include "quote.h"
 #include "tree.h"
 #include "parse-options.h"
+#include "object-store.h"
 
 static struct treeent {
        unsigned mode;