Merge branch 'va/i18n-even-more'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 05c7b71ca806aef86b8286e59db13edf38547a0c..27c1a05246c21278a730698bd7de85eccc96d721 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -548,7 +548,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
                         * entries in the index.
                         */
 
-                       add_files_to_cache(NULL, NULL, 0);
+                       add_files_to_cache(NULL, NULL, 0, 0);
                        /*
                         * NEEDSWORK: carrying over local changes
                         * when branches have different end-of-line