Mercurial > emacs

changeset 73162:100ba3326f08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Jonathan Yavner <jyavner@member.fsf.org>
date Fri, 29 Sep 2006 02:42:39 +0000
parents cc2767d69d49
children 4498fb838f40
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Sep 29 02:40:15 2006 +0000
+++ b/lisp/ChangeLog	Fri Sep 29 02:42:39 2006 +0000
@@ -82,7 +82,6 @@
 	continued lines.
 	(line-move-1): Remove flawed test for that case.
 
->>>>>>> 1.10122
 2006-09-24  Ken Manheimer  <ken.manheimer@gmail.com>
 
 	* icomplete.el (icomplete-simple-completing-p): Use the correct