Mercurial > emacs

changeset 105259:5707f7454ab5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Michael Albinus <michael.albinus@gmx.de>
date Mon, 28 Sep 2009 14:27:48 +0000
parents 0e947a4050e9
children bbd7017a25d9
files doc/misc/ChangeLog
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/doc/misc/ChangeLog	Mon Sep 28 14:27:08 2009 +0000
+++ b/doc/misc/ChangeLog	Mon Sep 28 14:27:48 2009 +0000
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (History): Add IMAP support.
@@ -9,12 +8,10 @@
 
 	* trampver.texi: Set default value of `emacsimap'.
 
-=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
->>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired-x.texi (Technical Details): Delete