rebase: Support preserving merges in non-interactive mode

diff --git a/merge-recursive.h b/merge-recursive.h
index 4f5537417e3b290544138edaec9c32469c19e477..fd138ca14006843a7ce0c38cfde4de580d5ce36e 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,6 +1,8 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
+#include "string-list.h"
+
 struct merge_options {
        const char *branch1;
        const char *branch2;
@@ -10,6 +12,9 @@ struct merge_options {
        int diff_rename_limit;
        int merge_rename_limit;
        int call_depth;
+       struct strbuf obuf;
+       struct string_list current_file_set;
+       struct string_list current_directory_set;
 };
 
 /* merge_trees() but with recursive ancestor consolidation */