From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25507-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 28424 invoked from network); 22 Aug 2008 10:37: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; 22 Aug 2008 10:37:07 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 41508 invoked from network); 22 Aug 2008 10:36:43 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 22 Aug 2008 10:36:43 -0000
Received: (qmail 26142 invoked by alias); 22 Aug 2008 10:36:34 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25507
Received: (qmail 26117 invoked from network); 22 Aug 2008 10:36:31 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 22 Aug 2008 10:36:31 -0000
Received: from cork.scru.org (cork.scru.org [209.20.67.2])
	by bifrost.dotsrc.org (Postfix) with ESMTPS id 94F35801E2B4
	for <zsh-workers@sunsite.dk>; Fri, 22 Aug 2008 12:36:24 +0200 (CEST)
Received: by cork.scru.org (Postfix, from userid 1000)
	id 3E97F104086; Fri, 22 Aug 2008 10:36:22 +0000 (UTC)
Date: Fri, 22 Aug 2008 10:36:22 +0000
From: Clint Adams <clint@zsh.org>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _git: Update __git_merge_strategies to work with new git.
Message-ID: <20080822103622.GA31581@scru.org>
Mail-Followup-To: zsh-workers <zsh-workers@sunsite.dk>
References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com> <20080821122947.GA4065@scru.org> <237967ef0808211319u42388b15w330c324e3f8043e@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <237967ef0808211319u42388b15w330c324e3f8043e@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Virus-Scanned: ClamAV 0.92.1/8072/Fri Aug 22 11:20:03 2008 on bifrost
X-Virus-Status: Clean

On Thu, Aug 21, 2008 at 10:19:18PM +0200, Mikael Magnusson wrote:
> Yes, touch /usr/local/bin/git-merge-clint and +x it:
> % git merge -s ''
> Could not find merge strategy ''.
> Available strategies are: file octopus ours recursive resolve subtree.
> Available custom strategies are: mikachu.

Doesn't do anything with my version.

> So it should be
> merge_strategies_cache=(${(s: :)${${${${(f)"$(git merge -s ''
> 2>&1)"}[(r)[Aa]vailable strategies are: *,(r)]}%%.}##*: }})

Gives me a blank array.

Maybe this:

${(s: :)${${(M)${(f)"$(git merge -s '' 2>&1)"}:#[Aa]vailable strategies are: *}#[Aa]vailable strategies are: }%.}