609   typeset -A opt_args

   609   typeset -A opt_args

   610 

   610 

   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' \

   615 

   616 

   616   if [[ $state == 'resolve_files' ]]

   617   if [[ $state == 'resolve_files' ]]

   617   then

   618   then

   618     _alternative 'files:resolved files:_hg_resolved' \

   619     _alternative 'files:resolved files:_hg_resolved' \

   619       'files:unresolved files:_hg_unresolved'

   620       'files:unresolved files:_hg_unresolved'