From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25501-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 7293 invoked from network); 21 Aug 2008 12:30:16 -0000
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88)
  by ns1.primenet.com.au with SMTP; 21 Aug 2008 12:30:16 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 32332 invoked from network); 21 Aug 2008 12:30:10 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 21 Aug 2008 12:30:10 -0000
Received: (qmail 17033 invoked by alias); 21 Aug 2008 12:30:04 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25501
Received: (qmail 17004 invoked from network); 21 Aug 2008 12:30:02 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 21 Aug 2008 12:30:02 -0000
Received: from cork.scru.org (cork.scru.org [209.20.67.2])
	by bifrost.dotsrc.org (Postfix) with ESMTPS id 72BF08030847
	for <zsh-workers@sunsite.dk>; Thu, 21 Aug 2008 14:29:54 +0200 (CEST)
Received: by cork.scru.org (Postfix, from userid 1000)
	id 933E1104086; Thu, 21 Aug 2008 12:29:47 +0000 (UTC)
Date: Thu, 21 Aug 2008 12:29:47 +0000
From: Clint Adams <clint@zsh.org>
To: Mikael Magnusson <mikachu@gmail.com>
Cc: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _git: Update __git_merge_strategies to work with new git.
Message-ID: <20080821122947.GA4065@scru.org>
Mail-Followup-To: Mikael Magnusson <mikachu@gmail.com>,
	zsh-workers <zsh-workers@sunsite.dk>
References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Virus-Scanned: ClamAV 0.92.1/8061/Thu Aug 21 02:00:17 2008 on bifrost
X-Virus-Status: Clean

On Thu, Aug 21, 2008 at 01:43:15PM +0200, Mikael Magnusson wrote:
> -  merge_strategies_cache=(${${=${${(M)${(f)"$(<$(git
> --exec-path)/git-merge)"}:#all_strategies*}##all_strategies=\'}%%\'}:#recur})
> +  merge_strategies_cache=(${(s: :)${${${${(ps:\n:)"$(git merge -s ''
> 2>&1)"}[(r)Available strategies are: *,(r)]}%%.}##*: }})

With 1.5.6.3 I get no capital A:

% git merge -s ''
available strategies are: recur recursive octopus resolve stupid ours subtree

Also (ps:\n:) can be written as (f), but is the output ever more than
one line?

See if 

merge_strategies_cache=(${=${${"$(git merge -s '' 2>&1)"}#[Aa]vailable strategies are: }})

does the right thing for you.