Mercurial > emacs

diff man/ChangeLog @ 62547:5e481e5664d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Carsten Dominik <dominik@science.uva.nl>
date Fri, 20 May 2005 11:27:45 +0000
parents 60730e506f15
children 56541edc86ad
line wrap: on
line diff
--- a/man/ChangeLog	Fri May 20 11:24:48 2005 +0000
+++ b/man/ChangeLog	Fri May 20 11:27:45 2005 +0000
@@ -1,3 +1,13 @@
+2005-05-20  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.09
+
+<<<<<<< ChangeLog
+2005-05-18  Carsten Dominik  <dominik@science.uva.nl>
+
+	* reftex.texi: Version 4.28
+
+=======
 2005-05-18  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* buffers.texi (Select Buffer): Document `C-u M-g M-g'.
@@ -114,6 +124,7 @@
 
 	* building.texi (Debugger Operation): Clarify previous change.
 
+>>>>>>> 1.574
 2005-04-29  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.texi: Version 3.08, structure reorganized.