Merge branch 'uk/merge-subtree-doc-update' into maint

diff --git a/resolve-undo.h b/resolve-undo.h
index 87291904bd34e0e7f3a3601b6742f5345391824d..fbe348efac929f9202c4f3e81d962e84157b9082 100644 (file)
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -1,6 +1,8 @@
 #ifndef RESOLVE_UNDO_H
 #define RESOLVE_UNDO_H
 
+#include "cache.h"
+
 struct resolve_undo_info {
        unsigned int mode[3];
        struct object_id oid[3];