diff options
author | Oliver Kiddle <opk@zsh.org> | 2021-08-29 17:08:34 +0200 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2021-08-29 17:08:34 +0200 |
commit | a9386df5581487e5e34ecb3ce422bacf62d10c3d (patch) | |
tree | 06f05ac1ef1e4d502ae50e42c3a5fc1dabbf8baa /Completion/Unix/Command/_wiggle | |
parent | 12676c0f9fd670556a81625f23205d832a95fb17 (diff) | |
download | zsh-a9386df5581487e5e34ecb3ce422bacf62d10c3d.tar.gz zsh-a9386df5581487e5e34ecb3ce422bacf62d10c3d.tar.xz zsh-a9386df5581487e5e34ecb3ce422bacf62d10c3d.zip |
49319: completion options update
Diffstat (limited to 'Completion/Unix/Command/_wiggle')
-rw-r--r-- | Completion/Unix/Command/_wiggle | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Completion/Unix/Command/_wiggle b/Completion/Unix/Command/_wiggle index 0a2f0c0cb..1d747a479 100644 --- a/Completion/Unix/Command/_wiggle +++ b/Completion/Unix/Command/_wiggle @@ -1,15 +1,17 @@ #compdef wiggle -local fns='-m --merge -d --diff -x --extract' +local fns='-m --merge -d --diff -x --extract -B --browse' _arguments \ "($fns -1 -2 -3)"{-m,--merge}'[select the merge function]' \ "($fns -3 3)"{-d,--diff}'[display differences between files]' \ "($fns 2 3)"{-x,--extract}'[extract one branch of a patch or merge file]' \ '(-w --words -l --lines)'{-w,--words}'[make operations and display word based]' \ - '(-l --lines -w --words)'{-l,--lines}'[make operations and display line based]' \ + '(-l --lines -w --words --non-space)'{-l,--lines}'[make operations and display line based]' \ + '(-l --lines)--non-space[words are separated by spaces]' \ '(-p --patch)'{-p,--patch}'[treat last named file as a patch]' \ '(-r --replace)'{-r,--replace}'[replace original file with merged output]' \ + '--no-backup[never save original file (as name.porig)]' \ '(-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]' \ |