Mercurial > emacs

changeset 72259:7fcd41d936c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Romain Francoise <romain@orebokech.com>
date Thu, 03 Aug 2006 18:41:58 +0000
parents 80f088e3c26d
children 6e63f47b8977
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Aug 03 18:30:37 2006 +0000
+++ b/lisp/ChangeLog	Thu Aug 03 18:41:58 2006 +0000
@@ -185,13 +185,8 @@
 
 	* tumme.el (tumme-backward-image): Add prefix argument.  Add error
 	when at first image.
-<<<<<<< ChangeLog
-	(tumme-forward-image): Add prefix argument.
-	Add error when at last image.
-=======
 	(tumme-forward-image): Add prefix argument.  Add error when at last
 	image.
->>>>>>> 1.9899
 
 2006-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>