diff options
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index ec85af565a..13169221b1 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -195,9 +195,9 @@ static int checkout_merged(int pos, struct checkout *state) if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2])) return error(_("path '%s' does not have necessary versions"), path); - read_mmblob(&ancestor, threeway[0].hash); - read_mmblob(&ours, threeway[1].hash); - read_mmblob(&theirs, threeway[2].hash); + read_mmblob(&ancestor, &threeway[0]); + read_mmblob(&ours, &threeway[1]); + read_mmblob(&theirs, &threeway[2]); /* * NEEDSWORK: re-create conflicts from merges with |