Merge branch 'en/removing-untracked-fixes'

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 3fbdacc7db4d86893b52d2d82f3e729955ce10ed..0ccd5e1ac8372954593de80a31f6ea7c67d77c4c 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -680,6 +680,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
        opts.verbose_update = 1;
        opts.trivial_merges_only = 1;
        opts.merge = 1;
+       opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
        trees[nr_trees] = parse_tree_indirect(common);
        if (!trees[nr_trees++])
                return -1;