about 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 53f95a953..5e0fa12e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-02  Clint Adams  <clint@zsh.org>
 
+	* 23639: Completion/Unix/Command/_git: merge in git merge-tree
+	completion from Nikolai Weibull's repository.
+
 	* 23629: Etc/FTP-README: change references to "beta" to "dev" or
 	"development".