diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 15:57:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 16:48:10 (GMT) |
| commit | 32eaa4688387d37398f0bc498335355a28efb0c7 (patch) | |
| tree | cef97cc234d7958b4c20d34e272baacdcc15ca48 /builtin | |
| parent | 5adbb403c24880b758149378bc7874d7617db4bc (diff) | |
| download | git-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 'builtin')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 29ef500..cd9be50 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -208,7 +208,8 @@ static int checkout_merged(int pos, const struct checkout *state) * merge.renormalize set, too */ status = ll_merge(&result_buf, path, &ancestor, "base", - &ours, "ours", &theirs, "theirs", NULL); + &ours, "ours", &theirs, "theirs", + state->istate, NULL); free(ancestor.ptr); free(ours.ptr); free(theirs.ptr); |