Mercurial > hg-stable

changeset 7386:86bfd65532ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh: make resolve with no options only complete unresolved files
author Brendan Cully <brendan@kublai.com>
date Mon, 17 Nov 2008 11:45:38 -0800
parents 8119c1a607c4
children 7e9a15fa6c8f 72f0e4ebd9e6
files contrib/zsh_completion
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/zsh_completion	Sun Nov 16 20:56:55 2008 -0800
+++ b/contrib/zsh_completion	Mon Nov 17 11:45:38 2008 -0800
@@ -611,7 +611,8 @@
   _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