From 00db34584361dd7309876d9d130ae63c85308d70 Mon Sep 17 00:00:00 2001 From: Jeremiah Mahler Date: Thu, 5 Dec 2019 03:28:16 +0000 Subject: [PATCH] wording: s/where the can/that can/ Signed-off-by: Jeremiah Mahler --- worktree.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worktree.go b/worktree.go index 4a609e9ea..04b46cd77 100644 --- a/worktree.go +++ b/worktree.go @@ -47,7 +47,7 @@ type Worktree struct { // Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are // no changes to be fetched, or an error. // -// Pull only supports merges where the can be resolved as a fast-forward. +// Pull only supports merges that can be resolved as a fast-forward. func (w *Worktree) Pull(o *PullOptions) error { return w.PullContext(context.Background(), o) } @@ -56,7 +56,7 @@ func (w *Worktree) Pull(o *PullOptions) error { // branch. Returns nil if the operation is successful, NoErrAlreadyUpToDate if // there are no changes to be fetched, or an error. // -// Pull only supports merges where the can be resolved as a fast-forward. +// Pull only supports merges that can be resolved as a fast-forward. // // The provided Context must be non-nil. If the context expires before the // operation is complete, an error is returned. The context only affects to the