ll-merge.c: remove implicit dependency on the_index

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-09-21 17:57:27 +02:00
committed by Junio C Hamano
parent 5adbb403c2
commit 32eaa46883
9 changed files with 34 additions and 21 deletions

View File

@ -1083,7 +1083,8 @@ static int merge_3way(struct merge_options *o,
read_mmblob(&src2, &b->oid);
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
&src1, name1, &src2, name2, &ll_opts);
&src1, name1, &src2, name2,
&the_index, &ll_opts);
free(base_name);
free(name1);