emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit 8ced37e405 1/2: manual: Fix typo


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 8ced37e405 1/2: manual: Fix typo
Date: Wed, 18 May 2022 20:58:15 -0400 (EDT)

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

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

diff --git a/docs/magit.org b/docs/magit.org
index 062ebe82c8..64f0fd58c9 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -3509,7 +3509,7 @@ information on how to use Ediff itself, see info:ediff.
   The A, B and Ancestor buffers are constructed from the conflict
   markers in the worktree file.  Because you and/or Git may have
   already resolved some conflicts, that means that these buffers
-  to not contain the actual versions from the respective blobs.
+  may not contain the actual versions from the respective blobs.
 
 - Key: E m (magit-ediff-resolve-all) ::
 
diff --git a/docs/magit.texi b/docs/magit.texi
index f383df6553..0e9fb315fe 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -4379,7 +4379,7 @@ buffer.
 The A, B and Ancestor buffers are constructed from the conflict
 markers in the worktree file.  Because you and/or Git may have
 already resolved some conflicts, that means that these buffers
-to not contain the actual versions from the respective blobs.
+may not contain the actual versions from the respective blobs.
 
 @item @kbd{E m} (@code{magit-ediff-resolve-all})
 @kindex E m



reply via email to

[Prev in Thread] Current Thread [Next in Thread]