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

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

[nongnu] elpa/git-commit 02ecf1a1e3: manual: Use correct key E M for mag


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 02ecf1a1e3: manual: Use correct key E M for magit-ediff-resolve-all
Date: Fri, 10 May 2024 15:59:59 -0400 (EDT)

branch: elpa/git-commit
commit 02ecf1a1e34accb41f922b77af21c9eb5a0fed25
Author: Pieter van Oostrum <pieter@vanoostrum.org>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    manual: Use correct key E M for magit-ediff-resolve-all
---
 docs/magit.org  | 2 +-
 docs/magit.texi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index ba103dc4e4..e71435b3b7 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -3547,7 +3547,7 @@ information on how to use Ediff itself, see info:ediff.
   already resolved some conflicts, that means that these buffers
   may not contain the actual versions from the respective blobs.
 
-- Key: E m (magit-ediff-resolve-all) ::
+- Key: E M (magit-ediff-resolve-all) ::
 
   This command allows you to resolve all conflicts in the file at
   point using Ediff.  If there is no file at point or if it doesn't
diff --git a/docs/magit.texi b/docs/magit.texi
index 867747d063..d50c6ac240 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -4417,8 +4417,8 @@ markers in the worktree file.  Because you and/or Git may 
have
 already resolved some conflicts, that means that these buffers
 may not contain the actual versions from the respective blobs.
 
-@item @kbd{E m} (@code{magit-ediff-resolve-all})
-@kindex E m
+@item @kbd{E M} (@code{magit-ediff-resolve-all})
+@kindex E M
 @findex magit-ediff-resolve-all
 This command allows you to resolve all conflicts in the file at
 point using Ediff.  If there is no file at point or if it doesn't



reply via email to

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