Mercurial > emacs

diff man/ChangeLog @ 64516:2cd737c9eaea

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 Tue, 19 Jul 2005 16:58:19 +0000
parents a4590903b2c4
children 4b1847f05684
line wrap: on
line diff
--- a/man/ChangeLog	Tue Jul 19 16:54:26 2005 +0000
+++ b/man/ChangeLog	Tue Jul 19 16:58:19 2005 +0000
@@ -1,3 +1,13 @@
+2005-07-19  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.14
+
+<<<<<<< ChangeLog
+2005-07-04  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.13
+
+=======
 2005-07-19  Juri Linkov  <juri@jurta.org>
 
 	* files.texi (Comparing Files): Mention resync for `compare-windows'.
@@ -89,6 +99,7 @@
 	* mh-e.texi (Copying):
 	* trouble.texi (Checklist): Update FSF's address.
 
+>>>>>>> 1.631
 2005-07-03  Richard M. Stallman  <rms@gnu.org>
 
 	* flymake.texi (Example -- Configuring a tool called directly):