Mercurial > emacs

diff lisp/ChangeLog @ 94626:5eb3ee73ed4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-start-session): Don't call smerge-next if looking at conflict marker.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 05 May 2008 06:16:20 +0000
parents be875b5d451e
children 9cc7bc51e055
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon May 05 06:12:33 2008 +0000
+++ b/lisp/ChangeLog	Mon May 05 06:16:20 2008 +0000
@@ -1,3 +1,8 @@
+2008-05-05  Tom Tromey  <tromey@redhat.com>
+
+	* smerge-mode.el (smerge-start-session): Don't call smerge-next if
+	looking at conflict marker.
+
 2008-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo