# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1192845869 0
# Node ID fdc8e826d8751507e8cb063183771bf0f353cafd
# Parent  6ae4584fb3f60daec113cb2096ffdd8374c43e87
*** empty log message ***

diff -r 6ae4584fb3f6 -r fdc8e826d875 etc/NEWS
--- a/etc/NEWS	Sat Oct 20 02:02:22 2007 +0000
+++ b/etc/NEWS	Sat Oct 20 02:04:29 2007 +0000
@@ -166,8 +166,14 @@
 
 * Changes in Specialized Modes and Packages in Emacs 23.1
 
-** diff-fine-highlight highlights char-level details of changes in a diff hunk.
+** smerge-refine highlights word-level details of changes in conflict.
+It's used automatically as you move through conflicts, see smerge-auto-refine.
+
+** diff-refine-hunk highlights word-level details of changes in a diff hunk.
+It's used automatically as you move through hunks, see diff-auto-refine.
+
 ** archive-mode has basic support to browse Rar archives.
+
 ** talk.el has been extended for multiple tty support.
 
 ** compilation-auto-jump-to-first-error tells `compile' to jump to