merge-recursive: track information associated with directory renames

diff --git a/unpack-trees.h b/unpack-trees.h
index 847f217dbaecea678f48d5086e7099c3c24a53c4..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,