Merge branch 'jk/size-t'

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 4593f0c2cd6d4546a66298996ce8001d228d01f4..3018e61d048dacd178200ce380e319ae302b5790 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;