diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_diff3 | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index a0df4b107..81875ae12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 |