summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 64117ced5..b80bda16b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-25  Clint Adams  <clint@zsh.org>
 
+	* Mikael Magnusson: 23832: Completion/Unix/Command/_git: 
+	fix git merge -m completion.
+
 	* 23831: Completion/Unix/Command/_git: fix handling of merge
 	strategy option.