diff options
author | Peter Stephenson <pws@zsh.org> | 2014-06-02 14:33:39 +0100 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2014-06-02 14:33:39 +0100 |
commit | 09f29ef00cfc0bf69df322f77def5ddd87016eb3 (patch) | |
tree | dc97c14047134e2bf7cd77abfcf3d349809b0fa3 /ChangeLog | |
parent | 06a4913245b3f862e7343b37ee1fc268b4f8d6f5 (diff) | |
parent | b85b09b78b52b07cf0b83ae7892676327828a37f (diff) | |
download | zsh-09f29ef00cfc0bf69df322f77def5ddd87016eb3.tar.gz zsh-09f29ef00cfc0bf69df322f77def5ddd87016eb3.tar.xz zsh-09f29ef00cfc0bf69df322f77def5ddd87016eb3.zip |
Fix merge conflict
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index eee973699..416953db4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ glob scanner needed some coaxing with counting matches with (Y) glob qualifier. +2014-06-02 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 32662: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Fix stagedstr for empty repos + 2014-06-01 Barton E. Schaefer <schaefer@zsh.org> * 32653: Completion/Unix/Command/_php: complete files with the |