# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1165441914 28800
# Node ID 6099cfa7c4aa536a5e1a279662aa4fed892df7bb
# Parent  bcdab0b2a6f5ae2f488aee50093be03316ad344b# Parent  fc5ba0ab7f454f3d055086a5b2a1101fe9dd6841
Merge with mpm

diff -r fc5ba0ab7f45 -r 6099cfa7c4aa contrib/zsh_completion
--- a/contrib/zsh_completion	Wed Dec 06 15:29:17 2006 -0600
+++ b/contrib/zsh_completion	Wed Dec 06 13:51:54 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'
 }