Mercurial > hg
changeset 3818:bcdab0b2a6f5
Merge with mpm
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 06 Dec 2006 13:27:39 -0800 |
parents | 45a751d73080 (diff) 6fa11a9d7cac (current diff) |
children | 6099cfa7c4aa |
files | |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/zsh_completion Wed Dec 06 13:36:23 2006 -0600 +++ b/contrib/zsh_completion Wed Dec 06 13:27:39 2006 -0800 @@ -178,7 +178,7 @@ } _hg_status() { - status_files=(${(ps:\0:)"$(_hg_cmd status -0n$1 . 2>/dev/null)"}) + status_files=(${(ps:\0:)"$(_hg_cmd status -0n$1 ./$PREFIX 2>/dev/null)"}) } _hg_unknown() { @@ -619,7 +619,6 @@ _hg_cmd_update() { _arguments -s -w : $_hg_global_opts \ '(--clean -C)'{-C,--clean}'[overwrite locally modified files]' \ - '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \ ':revision:_hg_tags' }