diff options
Diffstat (limited to 'internal/git2go')
| -rw-r--r-- | internal/git2go/conflicts.go | 2 | ||||
| -rw-r--r-- | internal/git2go/merge.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/git2go/conflicts.go b/internal/git2go/conflicts.go index 67f91808a..9bca079ed 100644 --- a/internal/git2go/conflicts.go +++ b/internal/git2go/conflicts.go @@ -70,7 +70,7 @@ func ConflictsCommandFromSerialized(serialized string) (ConflictsCommand, error) return request, nil } -// Serialize serializes the conflicts result. +// SerializeTo serializes the conflicts result and writes it into the writer. func (m ConflictsResult) SerializeTo(writer io.Writer) error { return serializeTo(writer, m) } diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go index 39b2efe15..7659930a1 100644 --- a/internal/git2go/merge.go +++ b/internal/git2go/merge.go @@ -64,7 +64,7 @@ func (m MergeResult) SerializeTo(w io.Writer) error { return serializeTo(w, m) } -// Merge performs a merge via gitaly-git2go. +// Run performs a merge via gitaly-git2go. func (m MergeCommand) Run(ctx context.Context, cfg config.Cfg) (MergeResult, error) { if err := m.verify(); err != nil { return MergeResult{}, fmt.Errorf("merge: %w: %s", ErrInvalidArgument, err.Error()) |