From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25518-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 7490 invoked from network); 24 Aug 2008 18:41:07 -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; 24 Aug 2008 18:41:07 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 61151 invoked from network); 24 Aug 2008 18:40:58 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 24 Aug 2008 18:40:58 -0000
Received: (qmail 7761 invoked by alias); 24 Aug 2008 18:40:52 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25518
Received: (qmail 7748 invoked from network); 24 Aug 2008 18:40:50 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 24 Aug 2008 18:40:50 -0000
Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.189])
	by bifrost.dotsrc.org (Postfix) with ESMTP id CCAC4801E2B4
	for <zsh-workers@sunsite.dk>; Sun, 24 Aug 2008 20:40:47 +0200 (CEST)
Received: by nf-out-0910.google.com with SMTP id g13so1023765nfb.11
        for <zsh-workers@sunsite.dk>; Sun, 24 Aug 2008 11:40:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:message-id:date:from:to
         :subject:in-reply-to:mime-version:content-type
         :content-transfer-encoding:content-disposition:references;
        bh=TI+k38dIh+yVmpPhipT67ECWmozUOwThPD98+SPdp64=;
        b=kvPNZknM9Ys3TiYfGxkNGCKwPSH3GLLa42fLtj2O28J9ymaEZKWCAts6XKvVttCOOf
         NZKTEq7CmUoN+i2anqS+2wyO3GjK1ivPbzts9r12Or1PXQCiXSH/tIRCIOPZy61mtBeV
         RJrbXR4xEN5zwvJJdpku87DW++g4ddHUa4RgE=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references;
        b=uBWG9chKkOCNBPv2lIFQix0fPM8oWHzWK5YguVFf0ZHqRAl9/1W+go3PGv51DpBLlk
         ahk5g8RL1qE13LFSAKBJZimngwCFkcW9bIlP3nwUu+irTWoSUTwoClUQDvxrj9uymqU2
         PM+mx7nWe3w6q6q5FmYdnQt4Fw41Nm1BKIKto=
Received: by 10.210.25.19 with SMTP id 19mr858486eby.120.1219603246942;
        Sun, 24 Aug 2008 11:40:46 -0700 (PDT)
Received: by 10.210.19.20 with HTTP; Sun, 24 Aug 2008 11:40:46 -0700 (PDT)
Message-ID: <237967ef0808241140r20c09376wfcee421ac1db7e6b@mail.gmail.com>
Date: Sun, 24 Aug 2008 20:40:46 +0200
From: "Mikael Magnusson" <mikachu@gmail.com>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _git: Update __git_merge_strategies to work with new git.
In-Reply-To: <20080824163658.GA20363@scru.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com>
	 <20080821122947.GA4065@scru.org>
	 <237967ef0808211319u42388b15w330c324e3f8043e@mail.gmail.com>
	 <20080822103622.GA31581@scru.org>
	 <237967ef0808220841x635d8180n7c1b46ab682c8869@mail.gmail.com>
	 <20080824163658.GA20363@scru.org>
X-Virus-Scanned: ClamAV 0.92.1/8082/Sun Aug 24 18:40:03 2008 on bifrost
X-Virus-Status: Clean

2008/8/24 Clint Adams <clint@zsh.org>:
> On Fri, Aug 22, 2008 at 05:41:39PM +0200, Mikael Magnusson wrote:
>> That doesn't grab the custom strategies line... How about this? Sort
>> of a hack though... :)
>>
>> ${(s: :)${${${${(f)"$(echo; git merge -s '' 2>&1)"}[(r)[Aa]vailable
>> strategies are: *,(r)]}%%.}##*: }}
>
> ${=${${(M)${(f)"$(git merge -s '' 2>&1)"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.}

That works for me too.

-- 
Mikael Magnusson