Mercurial > hg > mercurial-crew-with-dirclash
changeset 3820:4f056896c093
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 06 Dec 2006 17:59:19 -0600 |
parents | e3ba19ec8c48 (current diff) 6099cfa7c4aa (diff) |
children | 2631b506e93d 158fce02dc40 |
files | |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -178,7 +178,7 @@ typeset -A _hg_cmd_globals } _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 @@ typeset -A _hg_cmd_globals _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' }