changeset 3545:b5de4d5d60be

merge with crew
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Oct 2006 09:29:42 +0200
parents 4745cf66f77d (current diff) fe9c1e886b5e (diff)
children 04d44c3d64f7
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/vim/hgcommand.vim	Thu Oct 26 09:22:10 2006 +0200
+++ b/contrib/vim/hgcommand.vim	Thu Oct 26 09:29:42 2006 +0200
@@ -372,7 +372,7 @@
       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 ""
--- a/contrib/zsh_completion	Thu Oct 26 09:22:10 2006 +0200
+++ b/contrib/zsh_completion	Thu Oct 26 09:29:42 2006 +0200
@@ -519,6 +519,7 @@
 _hg_qguards() {
   typeset -a guards
   local guard
+  compset -P "+|-"
   _hg_cmd qselect -s | while read guard
   do
     guards+=(${guard#(+|-)})