From 1f38454e00826c958807340d156302a78158966f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Nov 2018 10:37:01 +0200 Subject: [PATCH] ; * etc/NEWS: Fix last change. --- etc/NEWS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index b71ac804e39..efdd7dfeb0c 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. -- 2.39.5