diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 18:57:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 19:48:10 +0300 |
commit | 32eaa4688387d37398f0bc498335355a28efb0c7 (patch) | |
tree | cef97cc234d7958b4c20d34e272baacdcc15ca48 /merge-recursive.c | |
parent | 5adbb403c24880b758149378bc7874d7617db4bc (diff) |
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 939843e815..7edcda4db0 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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); |