X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=fd138ca14006843a7ce0c38cfde4de580d5ce36e;hb=003b33a8;hp=4f5537417e3b290544138edaec9c32469c19e477;hpb=5033639c951da27fc4d4becbc3e46dc05096ce63;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 4f5537417..fd138ca14 100644
--- 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 */