Mercurial > emacs

changeset 35114:77df443385ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Eli Zaretskii <eliz@gnu.org>
date Sun, 07 Jan 2001 09:56:59 +0000
parents 00b4a3c742a2
children 98a3ec955d8d
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Jan 07 09:53:54 2001 +0000
+++ b/lisp/ChangeLog	Sun Jan 07 09:56:59 2001 +0000
@@ -1386,7 +1386,6 @@
 	`verbatim' so that we don't inadvertently delete a non-existant
 	directory name.
 
->>>>>>> 1.1768
 2000-11-27  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/characters.el: Specify cases and syntaxes for