Mercurial > emacs

diff lisp/ChangeLog @ 87767:90318261ac4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-refine): Also work on "same change conflicts". (smerge-makeup-conflict): New command.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 15 Jan 2008 21:40:09 +0000
parents 3aaff51200f9
children 2dfbe4c86ab7
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jan 15 15:03:36 2008 +0000
+++ b/lisp/ChangeLog	Tue Jan 15 21:40:09 2008 +0000
@@ -1,3 +1,8 @@
+2008-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* smerge-mode.el (smerge-refine): Also work on "same change conflicts".
+	(smerge-makeup-conflict): New command.
+
 2008-01-15  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
 	* log-edit.el (log-edit): Doc fix.