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 /Completion/X/Command/_x_utils | |
| parent | 52f72086c93d4b5faec06665bc352246d3f4ec3f (diff) | |
| parent | 7d7242405a82332716b5fdba68f32ecabf6349be (diff) | |
| download | zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.gz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.xz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.zip | |
Fix merge conflict
Diffstat (limited to 'Completion/X/Command/_x_utils')
| -rw-r--r-- | Completion/X/Command/_x_utils | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils index 0ff0cf268..9448fd3df 100644 --- a/Completion/X/Command/_x_utils +++ b/Completion/X/Command/_x_utils @@ -69,7 +69,7 @@ xev) '-rv' ;; xhost) - local expl type ret=1 tmp match + local type tmp match if compset -P '-'; then tmp=(${(f)"$(xhost)"}) |