From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2313 invoked from network); 24 Aug 2008 23:37:39 -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=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 23:37:39 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 50219 invoked from network); 24 Aug 2008 23:37:30 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 24 Aug 2008 23:37:30 -0000 Received: (qmail 14768 invoked by alias); 24 Aug 2008 23:37:24 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25525 Received: (qmail 14750 invoked from network); 24 Aug 2008 23:37:22 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 24 Aug 2008 23:37:22 -0000 Received: from yx-out-2324.google.com (yx-out-2324.google.com [74.125.44.29]) by bifrost.dotsrc.org (Postfix) with ESMTP id B6817801E2B4 for ; Mon, 25 Aug 2008 01:37:07 +0200 (CEST) Received: by yx-out-2324.google.com with SMTP id 31so648022yxl.81 for ; Sun, 24 Aug 2008 16:37:06 -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:sender :to:subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references :x-google-sender-auth; bh=Svir33bkoL6KBqgDboUTtsaG5jWIWitUdz0pNo6ft+I=; b=ktLDQdZM3qMyYTBgkpFlkg9EZRrqGD5KQNxWDcimwm4ITNfEj0Q+O1a3iecvfl+lcS ysh4tPcXQJxXLn3kwQm2WnJZse7/uvVwr1zBECZ5BS+xWRxIRIltc8I8f6u2PXUrt0sZ LrRxWL3SDfTbzA+vnP2/Cxisn4qSfYZ0NqziU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references:x-google-sender-auth; b=myzOoF7YlEl3W4qHvFerzbyxuwfS6H84gxe7Sc5u21b+s1iXLtUw06tJoUz40TTvNV k9mNRqEKoeVSvlRHuTjCqY/vXsm7hdGZ/5Frg4NJqQt1x5vktb+8NBfT06dfrTW91A/O WjrfD+0FUlTZETET4wx/alCqMDQy92OXMWdkw= Received: by 10.151.108.17 with SMTP id k17mr6061448ybm.51.1219621026304; Sun, 24 Aug 2008 16:37:06 -0700 (PDT) Received: by 10.150.96.21 with HTTP; Sun, 24 Aug 2008 16:37:06 -0700 (PDT) Message-ID: Date: Mon, 25 Aug 2008 01:37:06 +0200 From: "Nikolai Weibull" Sender: nikolai.weibull@gmail.com To: zsh-workers Subject: Re: _git: Update __git_merge_strategies to work with new git. In-Reply-To: <20080824191244.GA23476@scru.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 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> <237967ef0808241140r20c09376wfcee421ac1db7e6b@mail.gmail.com> <20080824191244.GA23476@scru.org> X-Google-Sender-Auth: 4ee12e88569d4c24 X-Virus-Scanned: ClamAV 0.92.1/8082/Sun Aug 24 18:40:03 2008 on bifrost X-Virus-Status: Clean On Sun, Aug 24, 2008 at 21:12, Clint Adams wrote: > On Sun, Aug 24, 2008 at 08:40:46PM +0200, Mikael Magnusson wrote: >> > ${=${${(M)${(f)"$(git merge -s '' 2>&1)"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.} >> That works for me too. > Do we know why the current function excludes "recur"? Should that be > retained? There must have been a reason, but I can't remember why I excluded it.