[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99987: lisp/ChangeLog: Remove mer
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99987: lisp/ChangeLog: Remove merge markers. |
|
Date: |
Thu, 19 Aug 2010 01:32:39 +0200 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99987
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-08-19 01:32:39 +0200
message:
lisp/ChangeLog: Remove merge markers.
modified:
lisp/ChangeLog
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-08-18 18:24:52 +0000
+++ b/lisp/ChangeLog 2010-08-18 23:32:39 +0000
@@ -73,7 +73,6 @@
(ctext-no-compositions): Doc fix.
(compound-text-with-extensions): Doc fix.
->>>>>>> MERGE-SOURCE
2010-08-04 Stefan Monnier <address@hidden>
* simple.el (exchange-dot-and-mark): Mark obsolete, finally.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99987: lisp/ChangeLog: Remove merge markers.,
Juanma Barranquero <=