diff options
Diffstat (limited to 'internal/git2go/merge.go')
| -rw-r--r-- | internal/git2go/merge.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go index a60ff51c8..90a2db549 100644 --- a/internal/git2go/merge.go +++ b/internal/git2go/merge.go @@ -69,13 +69,13 @@ func (m MergeCommand) Run(ctx context.Context, cfg config.Cfg) (MergeResult, err return MergeResult{}, err } - stdout, err := run(ctx, cfg, "merge", serialized) + stdout, err := run(ctx, binaryPathFromCfg(cfg), nil, "merge", "-request", serialized) if err != nil { return MergeResult{}, err } var response MergeResult - if err := deserialize(stdout, &response); err != nil { + if err := deserialize(stdout.String(), &response); err != nil { return MergeResult{}, err } |