Merge branch 'en/rebase-i-microfixes'

diff --git a/combine-diff.c b/combine-diff.c
index 2ef495963fc1cf2e092778d35f1965912d7eaac0..de7695e72824f6f041e0979e29302ded6e50d611 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "object-store.h"
 #include "commit.h"
 #include "blob.h"
 #include "diff.h"