manual: Use correct key E M for magit-ediff-resolve-all

magit · May 10, 2024 · 02ecf1a · 02ecf1a
1 parent 24ea9b0
commit 02ecf1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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