about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorOliver Kiddle <opk@zsh.org>2014-11-05 22:50:48 +0100
committerOliver Kiddle <opk@zsh.org>2014-11-05 22:50:48 +0100
commitc7ff843ecf60ab74ce98929e45029b1aef5014e1 (patch)
treea8fdeed6b399dd36c055e7030ccad10df1b1528a /ChangeLog
parent4b66ec003ff0631e39240576920dda971d555f6d (diff)
downloadzsh-c7ff843ecf60ab74ce98929e45029b1aef5014e1.tar.gz
zsh-c7ff843ecf60ab74ce98929e45029b1aef5014e1.tar.xz
zsh-c7ff843ecf60ab74ce98929e45029b1aef5014e1.zip
33604: fix change merging for vi mode where a change has just been undone
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
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