Merge branch 'sm/show-superproject-while-conflicted' into maint

diff --git a/refs.h b/refs.h
index a0a18223a146f0f676bb4165955333309c372a92..6cc0397679fd55bfdfc72b7a7f4cbf3ee5d028a0 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -3,8 +3,10 @@
 
 struct object_id;
 struct ref_store;
+struct repository;
 struct strbuf;
 struct string_list;
+struct string_list_item;
 struct worktree;
 
 /*