From 8186e9c94b6536b7e9ed8b40c467922c8d639f6d Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Wed, 26 Aug 2015 21:50:13 -0700
Subject: 36285: update 36025, context cannot be command and redirect at the
 same time, redirect wins

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index a0311ba9b..4b357044e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-08-26  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 36285: Src/Zle/zle_tricky.c: update 36025, context cannot be
+	command and redirect at the same time, redirect wins
+
 	* 36282: Test/A05execution.ztst: discard stderr of "hang" test
 
 2015-08-25  Peter Stephenson  <p.w.stephenson@ntlworld.com>
-- 
cgit 1.4.1