From: Glenn Morris <rgm@gnu.org>
Date: Wed, 20 Jun 2007 07:49:16 +0000 (+0000)
Subject: Move stray entry here from top-level changelog and reformat.
X-Git-Tag: emacs-pretest-23.0.90~12215
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ab7e318070e8068f43cb27d955cc08e1d464b80;p=emacs.git

Move stray entry here from top-level changelog and reformat.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c0935b982c..b31f7fce041 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -202,6 +202,11 @@
 
 	* vc-arch.el (vc-arch-command): Remove bzr.  It's a different program.
 
+2007-06-13  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+	* ediff-ptch.el (ediff-context-diff-label-regexp): Partially undo
+	previous change.
+
 2007-06-12  Tom Tromey  <tromey@redhat.com>
 
 	* subr.el (user-emacs-directory): New defconst.