# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2006-10-26 07:29:42
# Node ID b5de4d5d60be1858463f31cff6b719fcfc18f70d
# Parent  4745cf66f77d4d791f01025c80b13dbea7149dae
# Parent  fe9c1e886b5ea2e774c4408e123e89eb005caeeb

merge with crew

diff --git a/contrib/vim/hgcommand.vim b/contrib/vim/hgcommand.vim
--- a/contrib/vim/hgcommand.vim
+++ b/contrib/vim/hgcommand.vim
@@ -372,7 +372,7 @@ function! s:HGGetStatusVars(revisionVar,
       let revision="ADDED"
     else
       " The file is tracked, we can try to get is revision number
-      let hgCommand = <SID>HGGetOption("HGCommandHGExec", "hg") . " parents -b  "
+      let hgCommand = <SID>HGGetOption("HGCommandHGExec", "hg") . " parents "
       let statustext=system(hgCommand)
       if(v:shell_error)
           return ""
diff --git a/contrib/zsh_completion b/contrib/zsh_completion
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -519,6 +519,7 @@ typeset -A _hg_cmd_globals
 _hg_qguards() {
   typeset -a guards
   local guard
+  compset -P "+|-"
   _hg_cmd qselect -s | while read guard
   do
     guards+=(${guard#(+|-)})