diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 17:57:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 09:48:10 -0700 |
| commit | 32eaa4688387d37398f0bc498335355a28efb0c7 (patch) | |
| tree | cef97cc234d7958b4c20d34e272baacdcc15ca48 /merge-blobs.c | |
| parent | 5adbb403c24880b758149378bc7874d7617db4bc (diff) | |
| download | git-32eaa4688387d37398f0bc498335355a28efb0c7.tar.gz | |
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-blobs.c')
| -rw-r--r-- | merge-blobs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-blobs.c b/merge-blobs.c index fabb8c19ce..668fb2e05d 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -41,7 +41,8 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our * common ancestor. */ merge_status = ll_merge(&res, path, base, NULL, - our, ".our", their, ".their", NULL); + our, ".our", their, ".their", + &the_index, NULL); if (merge_status < 0) return NULL; |