diff options
Diffstat (limited to 'Completion/Unix/Command/_rcs')
| -rw-r--r-- | Completion/Unix/Command/_rcs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Completion/Unix/Command/_rcs b/Completion/Unix/Command/_rcs index 6f8de0213..da9cfd3b3 100644 --- a/Completion/Unix/Command/_rcs +++ b/Completion/Unix/Command/_rcs @@ -1,8 +1,20 @@ -#compdef co ci rcs rcsdiff +#compdef co ci rcs rcsdiff merge local ret=1 -if [[ -d RCS && $service != ci ]]; then +if [[ $service = merge ]]; then + _arguments \ + '-E[output unmerged changes, bracketing conflicts]' \ + '-A[output conflicts using the -A style of diff3]' \ + '-e[output unmerged changes]' \ + '*-L[specify labels for corresponding files]' \ + '-p[send results to standard output]' \ + '-q[do not warn about conflicts (quiet)]' \ + '-V[display version information]' \ + '1:file:_files' \ + '2:original file:_files' \ + '3:modified file:_files' && ret=0 +elif [[ -d RCS && $service != ci ]]; then local rep expl rep=(RCS/*,v(D:t:s/\,v//)) |