t/t5400: demonstrate breakage caused by informational message from prune

[git-core/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 7e1e972..58f3435 100644 (file)
--- 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 */