summaryrefslogtreecommitdiff
path: root/Completion/Unix/Command/_wiggle
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2016-12-04 04:32:03 +0100
committerAxel Beckert <abe@deuxchevaux.org>2016-12-04 04:32:03 +0100
commit3e439c3863f14c82f70666804c8570a13b3732e6 (patch)
tree07036c43e0f3f9242bb6dd42cd2a849ec8ea8aca /Completion/Unix/Command/_wiggle
parent2aedc4b88fd0e87b89583983951b04b96f48efd3 (diff)
parent7b7e84f0815ed22a0ee348a217776529035dccf3 (diff)
downloadzsh-3e439c3863f14c82f70666804c8570a13b3732e6.tar.gz
zsh-3e439c3863f14c82f70666804c8570a13b3732e6.zip
Merge tag 'zsh-5.2-test-1' into debian
Diffstat (limited to 'Completion/Unix/Command/_wiggle')
-rw-r--r--Completion/Unix/Command/_wiggle2
1 files changed, 1 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_wiggle b/Completion/Unix/Command/_wiggle
index ec71fdcb9..0a2f0c0cb 100644
--- a/Completion/Unix/Command/_wiggle
+++ b/Completion/Unix/Command/_wiggle
@@ -9,7 +9,7 @@ _arguments \
'(-w --words -l --lines)'{-w,--words}'[make operations and display word based]' \
'(-l --lines -w --words)'{-l,--lines}'[make operations and display line based]' \
'(-p --patch)'{-p,--patch}'[treat last named file as a patch]' \
- '(-r --replace)'{-r,--replace}'[replace orginal file with merged output]' \
+ '(-r --replace)'{-r,--replace}'[replace original file with merged output]' \
'(-R --reverse -x --extract)'{-R,--reverse}'[swap the files or revert changes]' \
'(-2 -3 -m --merge)-1[select branch]' \
'(-1 -3 -m --merge)-2[select branch]' \