aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 76c9dbc3315..72818278781 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -386,6 +386,10 @@ end of the word).
386 386
387* Changes in Specialized Modes and Packages in Emacs 26.1 387* Changes in Specialized Modes and Packages in Emacs 26.1
388 388
389*** Info menu and index completion uses substring completion by default.
390This can be customized via the `info-menu` category in
391completion-category-override.
392
389+++ 393+++
390*** The ancestor buffer is shown by default in 3way merges. 394*** The ancestor buffer is shown by default in 3way merges.
391A new option ediff-show-ancestor and a new toggle 395A new option ediff-show-ancestor and a new toggle