From e349201f9a9521cd4e7db2bd3f6d5016ec33001b Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Fri, 22 Apr 2011 06:00:27 +0000
Subject: 29025: Test/A01grammar.ztst: in select test, assert LINES=3 to print
 list

---
 ChangeLog | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ca21ba488..c6cc365d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-21  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 29025: Test/A01grammar.ztst: in select test, assert LINES=3
+	along with COLUMNS=80 so that the selectlist is sure to be
+	printed where the control script can capture/examine it.
+
 2011-04-21  Frank Terbeck  <ft@bewatermyfriend.org>
 
 	* Valentin Haenel: 29019, Completion/Unix/Command/_git: Fix git
@@ -43,6 +49,7 @@
 	* 28998: Completion/Unix/Command/_make: set return status
 	correctly.
 
+>>>>>>> 1.5257
 2011-04-14  Peter Stephenson  <pws@csr.com>
 
 	* 28997: configure.ac, Src/system.h: make --enable-libc-musl
@@ -14496,5 +14503,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5257 $
+* $Revision: 1.5258 $
 *****************************************************
-- 
cgit 1.4.1