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

diff --git a/merge-recursive.h b/merge-recursive.h
index be84d9bb3..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;
@@ -11,6 +13,8 @@ struct merge_options {
 	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 */