summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2007-09-25 17:58:50 +0000
committerClint Adams <clint@users.sourceforge.net>2007-09-25 17:58:50 +0000
commit9433977a83f67cab603922f2bfc3f65ee6e2a096 (patch)
tree3b07855836b59891f2661658b0bea1057f15e216 /ChangeLog
parent23829: merge in the remaining git completion changes from Nikolai Weibull's r... (diff)
downloadzsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.tar
zsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.tar.gz
zsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.tar.bz2
zsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.tar.lz
zsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.tar.xz
zsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.tar.zst
zsh-9433977a83f67cab603922f2bfc3f65ee6e2a096.zip
23831: fix handling of merge strategy option.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 45bd9469e..64117ced5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-09-25 Clint Adams <clint@zsh.org>
+ * 23831: Completion/Unix/Command/_git: fix handling of merge
+ strategy option.
+
* 23829: Completion/Unix/Command/_git: merge in the remaining
git completion changes from Nikolai Weibull's repository.