diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 15:57:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 16:48:10 (GMT) |
| commit | f4a55b27977aeaddbfb73041be26701bcd3868a5 (patch) | |
| tree | e5ad32d53210d753a2069f66ccf9182a13a84876 /builtin | |
| parent | 32eaa4688387d37398f0bc498335355a28efb0c7 (diff) | |
| download | git-f4a55b27977aeaddbfb73041be26701bcd3868a5.zip git-f4a55b27977aeaddbfb73041be26701bcd3868a5.tar.gz git-f4a55b27977aeaddbfb73041be26701bcd3868a5.tar.bz2 | |
merge-blobs.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 'builtin')
| -rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index f8023ba..f32941f 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -76,7 +76,7 @@ static void *result(struct merge_list *entry, unsigned long *size) their = NULL; if (entry) their = entry->blob; - return merge_blobs(path, base, our, their, size); + return merge_blobs(&the_index, path, base, our, their, size); } static void *origin(struct merge_list *entry, unsigned long *size) |