[nongnu] elpa/git-commit 94014e6007 1/2: manual: Fix typos

[ELPA Syncer]

branch: elpa/git-commit
commit 94014e6007b4f5e784fe961a794ebc01af3e1bd1
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    manual: Fix typos
---
 docs/magit.org  | 4 ++--
 docs/magit.texi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 7071eaa9cd..e7bb447d33 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 4a1c4e0142..8e869df2da 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