# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1165449559 21600
# Node ID 4f056896c0934ec4b3d7cec10a251474351cb877
# Parent  e3ba19ec8c48370edce21ccb0d5b17b35f4b581d# Parent  6099cfa7c4aa536a5e1a279662aa4fed892df7bb
Merge with crew

diff -r e3ba19ec8c48 -r 4f056896c093 contrib/zsh_completion
--- a/contrib/zsh_completion	Wed Dec 06 17:58:45 2006 -0600
+++ b/contrib/zsh_completion	Wed Dec 06 17:59:19 2006 -0600
@@ -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'
 }