about summary refs log tree commit diff
path: root/Doc
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2014-02-28 18:45:35 +0000
committerPeter Stephenson <pws@zsh.org>2014-02-28 18:45:35 +0000
commitf798f13b0eba1f31cd2d760441ac9d36a6ac5263 (patch)
tree2015479d9fcda696f4b91235bc21bf539ebb6a7c /Doc
parent52f72086c93d4b5faec06665bc352246d3f4ec3f (diff)
parent7d7242405a82332716b5fdba68f32ecabf6349be (diff)
downloadzsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.gz
zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.xz
zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.zip
Fix merge conflict
Diffstat (limited to 'Doc')
-rw-r--r--Doc/Zsh/compsys.yo2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 6f1917d36..c304461e2 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -2344,7 +2344,7 @@ This is used by the tt(_history) completer and the
 tt(_history_complete_word) bindable command to decide which words
 should be completed.  
 
-If it is a singe number, only the last var(N) words from the history
+If it is a single number, only the last var(N) words from the history
 will be completed.
 
 If it is a range of the form `var(max)tt(:)var(slice)',