Merge branch 'rs/status-with-removed-submodule'

diff --git a/merge-recursive.h b/merge-recursive.h
index 50a4e6af4e754bcda5cabfbcd5adf25a6243e972..d863cf88676ef321aad85d395f964efe5673a805 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,6 +1,7 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
+#include "unpack-trees.h"
 #include "string-list.h"
 
 struct merge_options {
@@ -27,6 +28,7 @@ struct merge_options {
        struct strbuf obuf;
        struct hashmap current_file_dir_set;
        struct string_list df_conflict_file_set;
+       struct unpack_trees_options unpack_opts;
 };
 
 /*