emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/ChangeLog


From: Chong Yidong
Subject: [Emacs-diffs] Changes to emacs/lisp/ChangeLog
Date: Mon, 06 Mar 2006 20:27:28 +0000

Index: emacs/lisp/ChangeLog
diff -u emacs/lisp/ChangeLog:1.9229 emacs/lisp/ChangeLog:1.9230
--- emacs/lisp/ChangeLog:1.9229 Mon Mar  6 20:27:06 2006
+++ emacs/lisp/ChangeLog        Mon Mar  6 20:27:28 2006
@@ -9,7 +9,6 @@
        * complete.el (PC-expand-many-files): Try be more careful when parsing
        the shell's output.
 
->>>>>>> 1.9228
 2006-03-05  Stefan Monnier  <address@hidden>
 
        * outline.el (hide-sublevels): Provide better interactive default.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]