Mercurial > emacs

diff etc/ChangeLog @ 101807:76eba80f3816

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix previous change.
author Glenn Morris <rgm@gnu.org>
date Thu, 05 Feb 2009 06:22:39 +0000
parents 800be5321d24
children 7abfdad8fc00
line wrap: on
line diff
--- a/etc/ChangeLog	Thu Feb 05 06:21:19 2009 +0000
+++ b/etc/ChangeLog	Thu Feb 05 06:22:39 2009 +0000
@@ -1,17 +1,3 @@
-<<<<<<< ChangeLog
-2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
-
-	* refcards/orgcard.tex: New version number.
-
-2009-01-31  Carsten Dominik  <dominik@science.uva.nl>
-
-	* refcards/orgcard.tex: New version number.
-
-2009-01-30  Carsten Dominik  <dominik@science.uva.nl>
-
-	* refcards/orgcard.tex: New version number.
-
-=======
 2009-02-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* compilation.txt (gnu): Add an example for the "note" format.
@@ -20,7 +6,10 @@
 
 	* PROBLEMS (CPP): Note problem with resource compiler of MSVC.
 
->>>>>>> 1.761
+2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
+
+	* refcards/orgcard.tex: New version number.
+
 2009-01-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.