about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
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