diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2024-02-17 23:51:37 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2024-02-18 00:07:25 -0500 |
| commit | 94014e6007b4f5e784fe961a794ebc01af3e1bd1 (patch) | |
| tree | c1f7c6114cafc1a9fc1a9964bb8406b865fc5b26 /docs | |
| parent | 8a3674b4272cb9490a559012752abaa771d28487 (diff) | |
manual: Fix typos
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/magit.org | 4 | ||||
| -rw-r--r-- | docs/magit.texi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/magit.org b/docs/magit.org index 7071eaa..e7bb447 100644 --- a/docs/magit.org +++ b/docs/magit.org @@ -1461,11 +1461,11 @@ telling Magit to ask fewer questions. operation loses all information collected so far. - ~abort-cherry-pick~ Aborting a cherry-pick throws away all - conflict resolutions which has already been carried out by the + conflict resolutions which have already been carried out by the user. - ~abort-revert~ Aborting a revert throws away all conflict - resolutions which has already been carried out by the user. + resolutions which have already been carried out by the user. - ~abort-rebase~ Aborting a rebase throws away all already modified commits, but it's possible to restore those from the reflog. diff --git a/docs/magit.texi b/docs/magit.texi index 4a1c4e0..8e869df 100644 --- a/docs/magit.texi +++ b/docs/magit.texi @@ -1936,12 +1936,12 @@ operation loses all information collected so far. @item @code{abort-cherry-pick} Aborting a cherry-pick throws away all -conflict resolutions which has already been carried out by the +conflict resolutions which have already been carried out by the user. @item @code{abort-revert} Aborting a revert throws away all conflict -resolutions which has already been carried out by the user. +resolutions which have already been carried out by the user. @item @code{abort-rebase} Aborting a rebase throws away all already modified |