diff options
| author | Pieter van Oostrum <pieter@vanoostrum.org> | 2024-05-10 17:37:03 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2024-05-10 19:01:08 +0200 |
| commit | 02ecf1a1e34accb41f922b77af21c9eb5a0fed25 (patch) | |
| tree | b41ef564d089aad81d74eb295b25d28f984e15e1 /docs | |
| parent | 24ea9b0ffd650f1a47e21c4db4a93c893e5a1447 (diff) | |
manual: Use correct key E M for magit-ediff-resolve-all
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/magit.org | 2 | ||||
| -rw-r--r-- | docs/magit.texi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/magit.org b/docs/magit.org index ba103dc..e71435b 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 867747d..d50c6ac 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 |