# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1165440459 28800
# Node ID bcdab0b2a6f5ae2f488aee50093be03316ad344b
# Parent  45a751d730805b1f00bf4a16f61447226c0fa0dd# Parent  6fa11a9d7cac20a05753649b1e50be271271e1f6
Merge with mpm

diff --git a/contrib/zsh_completion b/contrib/zsh_completion
--- 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'
 }