t6042: add tests for consistency in file collision conflict handling

diff --git a/unpack-trees.h b/unpack-trees.h
index 48bc69cb4725c9df032baf1937adaa988a774cc4..0135080a7b4e91713b66f68669e57a2f5e4edbdd 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -45,6 +45,7 @@ struct unpack_trees_options {
        unsigned int reset,
                     merge,
                     update,
+                    clone,
                     index_only,
                     nontrivial_merge,
                     trivial_merges_only,
@@ -85,8 +86,8 @@ struct unpack_trees_options {
        struct exclude_list *el; /* for internal use */
 };
 
-extern int unpack_trees(unsigned n, struct tree_desc *t,
-               struct unpack_trees_options *options);
+int unpack_trees(unsigned n, struct tree_desc *t,
+                struct unpack_trees_options *options);
 
 int verify_uptodate(const struct cache_entry *ce,
                    struct unpack_trees_options *o);