X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=58f3435e9e854ab82c2fd0c10c55520bc69e5ed0;hb=a12c6b0149e3dadd0701dac4fd0ba2463d251650;hp=7e1e972b13cb8a9f2fae084f769fffede24c8dbb;hpb=43176d1e4cddc4ab2f2f7dc6f3ba10513ffc2f2b;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 7e1e972b1..58f3435e9 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -26,6 +26,7 @@ struct merge_options {
 	struct strbuf obuf;
 	struct string_list current_file_set;
 	struct string_list current_directory_set;
+	struct string_list df_conflict_file_set;
 };
 
 /* merge_trees() but with recursive ancestor consolidation */