diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2018-09-15 01:47:04 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2018-09-15 01:47:04 +0200 |
| commit | 3d116bbb41654625687f0dbec0fef30b961e191d (patch) | |
| tree | 3a56be953e45a78a95404fd816c325eae9410be7 /Completion/Unix/Command/_subversion | |
| parent | 77265d89ccd13989f26366915c46a3f5775a4dce (diff) | |
| parent | 92bef88545ee9dc23f35886a8606c81610341477 (diff) | |
| download | zsh-3d116bbb41654625687f0dbec0fef30b961e191d.tar.gz zsh-3d116bbb41654625687f0dbec0fef30b961e191d.zip | |
Merge tag 'zsh-5.6.2' into debian
Patch release: 5.6.2
Diffstat (limited to 'Completion/Unix/Command/_subversion')
| -rw-r--r-- | Completion/Unix/Command/_subversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion index e16be7e59..d30f2e657 100644 --- a/Completion/Unix/Command/_subversion +++ b/Completion/Unix/Command/_subversion @@ -70,7 +70,7 @@ _svn () { ${=${${${(M)${(f)"$(_call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)(-##)([[:alpha:]]##) \[--([a-z-]##)\](:arg:)#/(--$match[3])$match[1]$match[2]$match[4] ($match[1]$match[2])--$match[3]$match[4]} ) while (( idx=$args[(I)*--accept:arg:] )); do - args[idx]=( --accept'=:automatic conflict resolution action:((working\:working base\:base '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; do print -rn $i\\\\:$j $j\\\\:$j ""; done `"'))' ) + args[idx]=( --accept'=:automatic conflict resolution action:((working\:working base\:base recommended\:recommended '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; do print -rn $i\\\\:$j $j\\\\:$j ""; done `"'))' ) done while (( idx=$args[(I)*--c(l|hangelist):arg:] )); do args[idx]=( \*{--cl,--changelist}'=:change list:_svn_changelists' ) |