merge-recursive: add computation of collisions due to dir rename & merging

diff --git a/merge-recursive.h b/merge-recursive.h
index fe64c78de403cf165d45421184b05205717f015e..50a4e6af4e754bcda5cabfbcd5adf25a6243e972 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -47,6 +47,13 @@ struct dir_rename_entry {
        struct string_list possible_new_dirs;
 };
 
+struct collision_entry {
+       struct hashmap_entry ent; /* must be the first member! */
+       char *target_file;
+       struct string_list source_files;
+       unsigned reported_already:1;
+};
+
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
                    struct commit *h1,