From c7ff843ecf60ab74ce98929e45029b1aef5014e1 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Wed, 5 Nov 2014 22:50:48 +0100
Subject: 33604: fix change merging for vi mode where a change has just been
 undone

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1b17490cf..cb739d5a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-05  Oliver Kiddle  <opk@zsh.org>
+
+	* 33604: Src/Zle/zle_utils.c, Src/Zle/zle_vi.c, Test/X02zlevi.ztst:
+	fix change merging for vi mode where a change has just been undone
+
 2014-11-04  Oliver Kiddle  <opk@zsh.org>
 
 	* 33596: Src/Zle/zle_keymap.c: make local keymap keybinding hide
-- 
cgit 1.4.1