Show More
@@ -611,7 +611,8 b' typeset -A _hg_cmd_globals' | |||
|
611 | 611 | _arguments -s -w : $_hg_global_opts \ |
|
612 | 612 | '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \ |
|
613 | 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 | 617 | if [[ $state == 'resolve_files' ]] |
|
617 | 618 | then |
General Comments 0
You need to be logged in to leave comments.
Login now