# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1182325756 0
# Node ID a5bc46e70093980f3633f98fd8288889f7936606
# Parent  2d50f85a03de3903e52bb091f49b90efe849454a
Move stray entry here from top-level changelog and reformat.

diff -r 2d50f85a03de -r a5bc46e70093 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jun 20 07:33:45 2007 +0000
+++ b/lisp/ChangeLog	Wed Jun 20 07:49:16 2007 +0000
@@ -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.