##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

zsh: make resolve with no options only complete unresolved files
Brendan Cully -
r7386:86bfd655 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -611,7 +611,8 b' typeset -A _hg_cmd_globals'
611 _arguments -s -w : $_hg_global_opts \
611 _arguments -s -w : $_hg_global_opts \
612 '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
612 '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
613 '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
613 '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
614 '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved'
614 '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \
615 '*:file:_hg_unresolved'
615
616
616 if [[ $state == 'resolve_files' ]]
617 if [[ $state == 'resolve_files' ]]
617 then
618 then
General Comments 0
You need to be logged in to leave comments. Login now