merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/cache.h b/cache.h
index d97db26bb671418e391c74f34f1e319170f87903..d508f3d4f8837caef469389c71950ee96eea709b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1528,6 +1528,7 @@ struct checkout {
        unsigned force:1,
                 quiet:1,
                 not_new:1,
+                clone:1,
                 refresh_cache:1;
 };
 #define CHECKOUT_INIT { NULL, "" }