diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2022-04-11 00:17:48 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2022-04-11 00:17:48 +0200 |
| commit | b09f4483416c54c1782824633dfabaf2ec0265b6 (patch) | |
| tree | 304bc82642862525ae680c7fbaa249663b10ad57 /Completion/Unix/Command/_wiggle | |
| parent | 12eb3e5356f2fc3351eed58ef1cef1b8fb83b504 (diff) | |
| parent | 6e55c920503071e917619b8cb1a188cd35d772db (diff) | |
| download | zsh-b09f4483416c54c1782824633dfabaf2ec0265b6.tar.gz zsh-b09f4483416c54c1782824633dfabaf2ec0265b6.zip | |
New upstream version 5.8.1.2-test
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]' \ |