# HG changeset patch # User Brendan Cully # Date 2008-11-17 19:45:38 # Node ID 86bfd65532ac4a6fa3568823218b0cede19ce03e # Parent 8119c1a607c49f4ea8968d67ab8984119fda26cf zsh: make resolve with no options only complete unresolved files diff --git a/contrib/zsh_completion b/contrib/zsh_completion --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -611,7 +611,8 @@ typeset -A _hg_cmd_globals _arguments -s -w : $_hg_global_opts \ '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \ '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \ - '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' + '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \ + '*:file:_hg_unresolved' if [[ $state == 'resolve_files' ]] then