diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-02-28 18:45:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-02-28 18:45:35 +0000 |
| commit | f798f13b0eba1f31cd2d760441ac9d36a6ac5263 (patch) | |
| tree | 2015479d9fcda696f4b91235bc21bf539ebb6a7c /ChangeLog | |
| parent | 52f72086c93d4b5faec06665bc352246d3f4ec3f (diff) | |
| parent | 7d7242405a82332716b5fdba68f32ecabf6349be (diff) | |
| download | zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.gz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.xz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.zip | |
Fix merge conflict
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index d4329ad4e..201f27399 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,25 @@ Functions/Zle/.distfiles, Functions/Zle/expand-absolute-path: new expand-absolute-path ZLE widget. +2014-02-26 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Jun T: Completion/Base/Core/_description, + Completion/Unix/Command/_rm: improved quoting for ignore-line + style. + +2014-02-24 Oliver Kiddle <opk@zsh.org> + + * unposted: Doc/Zsh/compsys.yo: fix typo + + * unposted: Completion/X/Command/_x_utils: duplicate local + statement was printing variable value + + * users/18498: Completion/Base/Completer/_expand_alias: observe + add-space style in _expand_alias so suffix can be disabled + + * users/18485: Completion/Unix/Command/_git: add .. as an + auto-removable suffix in git revision ranges + 2014-02-24 Peter Stephenson <p.stephenson@samsung.com> * Hong Xu: 32492: Completion/Unix/Command/_npm: fix outdated |