summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-09-21 15:57:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-21 16:48:10 (GMT)
commit32eaa4688387d37398f0bc498335355a28efb0c7 (patch)
treecef97cc234d7958b4c20d34e272baacdcc15ca48 /merge-blobs.c
parent5adbb403c24880b758149378bc7874d7617db4bc (diff)
downloadgit-32eaa4688387d37398f0bc498335355a28efb0c7.zip
git-32eaa4688387d37398f0bc498335355a28efb0c7.tar.gz
git-32eaa4688387d37398f0bc498335355a28efb0c7.tar.bz2
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-blobs.c b/merge-blobs.c
index fabb8c1..668fb2e 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;