diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-08-24 15:43:29 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-08-25 15:54:35 +0000 |
| commit | 1c5fb91e71271abfc8ed13bf7545de196f1fe764 (patch) | |
| tree | 621141c8c1efe96182b230569ce088e01c48fe79 | |
| parent | 43313 (log message tweaked): vcs_info git: For the branch name, try to find a... (diff) | |
| download | zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.tar zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.tar.gz zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.tar.bz2 zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.tar.lz zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.tar.xz zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.tar.zst zsh-1c5fb91e71271abfc8ed13bf7545de196f1fe764.zip | |
43331: _diff3: Enhance positional argument descriptions (thanks, Oliver).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_diff3 | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2018-08-25 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 43331: Completion/Unix/Command/_diff3: Enhance positional + argument descriptions (thanks, Oliver). + 2018-08-24 Daniel Shahaf <d.s@daniel.shahaf.name> * 43313 (log message tweaked): diff --git a/Completion/Unix/Command/_diff3 b/Completion/Unix/Command/_diff3 index 81e274d05..524507ce0 100644 --- a/Completion/Unix/Command/_diff3 +++ b/Completion/Unix/Command/_diff3 @@ -39,8 +39,8 @@ else fi _arguments -s -S $args \ - '1:updated file:_files' \ - '2:original file:_files' \ - '3:updated file:_files' \ + '1: : _wanted files expl "first updated file (${${(As.:.)opt_args[-L]}[1]:-mine})" _files' \ + '2: : _wanted files expl "original file (${${(As.:.)opt_args[-L]}[2]:-old})" _files' \ + '3: : _wanted files expl "second updated file (${${(As.:.)opt_args[-L]}[3]:-their})" _files' \ + '(ed)' $ed |