Mercurial > emacs

changeset 108104:17710e3a17df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict markers.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 24 Apr 2010 14:33:31 +0200
parents 01ca94871a56
children 70c3e33eb613
files src/ChangeLog
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Apr 24 14:11:40 2010 +0300
+++ b/src/ChangeLog	Sat Apr 24 14:33:31 2010 +0200
@@ -58,12 +58,7 @@
 
 2010-04-23  Eli Zaretskii  <eliz@gnu.org>
 
-	Support `display' text properties and overlay strings in bidi
-	buffers.
-=======
-2010-04-23  Eli Zaretskii  <eliz@gnu.org>
-
->>>>>>> MERGE-SOURCE
+	Support `display' text properties and overlay strings in bidi buffers.
 	* xdisp.c (pop_it): When the stack is popped after displaying
 	from a string, bidi-iterate to exit from the text portion covered
 	by the `display' property or overlay.  (Bug#5988, bug#5920)