[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1f38454 2/3: ; * etc/NEWS: Fix last change.
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] master 1f38454 2/3: ; * etc/NEWS: Fix last change. |
|
Date: |
Sat, 3 Nov 2018 04:40:47 -0400 (EDT) |
branch: master
commit 1f38454e00826c958807340d156302a78158966f
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
; * etc/NEWS: Fix last change.
---
etc/NEWS | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index b71ac80..efdd7df 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -339,8 +339,9 @@ When no files are marked, all modified files are stashed,
as before.
*** The new hook 'vc-retrieve-tag-hook' runs after retrieving a tag.
---- `vc-hg' now invokes `smerge-mode' correctly when visiting files.
-Code that attempted to invoke `smerge-mode' when visiting an Hg file
+---
+*** 'vc-hg' now invokes 'smerge-mode' when visiting files.
+Code that attempted to invoke 'smerge-mode' when visiting an Hg file
with conflicts existed in earlier versions of Emacs, but incorrectly
never detected a conflict due to invalid assumptions about cached
values.