aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2025-02-23 18:45:07 +0100
committerJonas Bernoulli <jonas@bernoul.li>2025-02-23 18:45:07 +0100
commitdee732651aefc0e8bb4db97dcf0a37b703bff003 (patch)
tree28abc42ab0d36da75cfd20674ac65d1da52f467b /CHANGELOG
parent9914feb4d5a2feab091076be554d80781594869d (diff)
changelog: Fix typos
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1117135..d10ccc9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,7 +52,7 @@ Bugfixes:
#5261
- The branch at point is detected in more contexts now, i.e., when
- there is not actually a branch at point, but one can unambigiously
+ there is not actually a branch at point, but one can unambiguously
be derived from the thing at point. 4876f1921e
- Reworked ~magit-process-password-prompt-regexps~ to be more permissive
@@ -101,7 +101,7 @@ Bug fixes:
- ~magit-stash-index~ did not use ~magit-stash-read-message-function~.
#5295
-- Fixed an error that occured when creating ~magit-hunk-section-map~
+- Fixed an error that occurred when creating ~magit-hunk-section-map~
and the user has disabled ~smerge-command-prefix~. The same bug
exists in Emacs since 29.1, so this will only help users stuck
on Emacs 28. #5300