PATCH: _baz fixes

[Clint Adams <clint@xxxxxxx>]

Index: Completion/Unix/Command/_baz
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_baz,v
retrieving revision 1.1
diff -u -r1.1 _baz
--- Completion/Unix/Command/_baz	15 Dec 2004 17:34:02 -0000	1.1
+++ Completion/Unix/Command/_baz	9 Mar 2005 01:56:52 -0000
@@ -8,7 +8,7 @@
 # ask the user which version of baz this is
 if ! zstyle -s ":completion:${curcontext}" baz-version baz_version; then
   # ask baz instead
-  baz_version="${${$($BAZ --version)#baz baz-}%% from regexps.com*}"
+  baz_version="${${$($BAZ --version)#baz Bazaar version }%% \(thelove@xxxxxxxxxxxxx*}"
 fi
 
 # test whether to hide short options from completion
@@ -496,8 +496,8 @@
 local cmd_branch
 cmd_branch=(':SOURCE-REVISION:_baz_revisions' ':TAG-VERSION:_baz_versions')
 
-local cmd_star_merge
-cmd_star_merge=(':FROM:_baz_revisions')
+local cmd_merge
+cmd_merge=(':FROM:_baz_revisions')
 
 local cmd_missing cmd_whats_missing
 cmd_missing=('::revision:_baz_revisions')