Mercurial > emacs

diff lisp/ChangeLog @ 93442:a6d8268a0da6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 Mar 2008 01:49:57 +0000
parents c13d8b4cc7ad
children 3a3281d7f1dd
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Mar 31 01:47:29 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 31 01:49:57 2008 +0000
@@ -1,3 +1,8 @@
+2008-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* smerge-mode.el (smerge-refine): Allow highlighting other subparts
+	in 3-way conflicts.
+
 2008-03-31  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for