diff options
Diffstat (limited to 'internal/git2go/conflicts.go')
| -rw-r--r-- | internal/git2go/conflicts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/git2go/conflicts.go b/internal/git2go/conflicts.go index c5848c618..67f91808a 100644 --- a/internal/git2go/conflicts.go +++ b/internal/git2go/conflicts.go @@ -86,13 +86,13 @@ func (c ConflictsCommand) Run(ctx context.Context, cfg config.Cfg) (ConflictsRes return ConflictsResult{}, err } - stdout, err := run(ctx, cfg, "conflicts", serialized) + stdout, err := run(ctx, binaryPathFromCfg(cfg), nil, "conflicts", "-request", serialized) if err != nil { return ConflictsResult{}, err } var response ConflictsResult - if err := deserialize(stdout, &response); err != nil { + if err := deserialize(stdout.String(), &response); err != nil { return ConflictsResult{}, err } |