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 6da23d08e..475539651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-24  Clint Adams  <clint@zsh.org>
+
+	* 25521: Completion/Unix/Command/_git: get merge strategies from
+	git merge in case the administrator has added custom strategies.
+
 2008-08-22  Peter Stephenson  <pws@csr.com>
 
 	* 25508: Src/exec.c: set file name if function came from