t4020: don't use grep -a

[git.git] / builtin-merge-recursive.c

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 5a0a7b529765fa229318af86a68e58a92e287154..5c7fbb2599d07ad7415ae8dfef205356ac3b0bbb 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -213,6 +213,8 @@ static int git_merge_trees(int index_only,
        opts.merge = 1;
        opts.head_idx = 2;
        opts.fn = threeway_merge;
+       opts.src_index = &the_index;
+       opts.dst_index = &the_index;
 
        init_tree_desc_from_tree(t+0, common);
        init_tree_desc_from_tree(t+1, head);