Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: _git: Update __git_merge_strategies to work with new git.
- X-seq: zsh-workers 25519
- From: Clint Adams <clint@xxxxxxx>
- To: zsh-workers <zsh-workers@xxxxxxxxxx>
- Subject: Re: _git: Update __git_merge_strategies to work with new git.
- Date: Sun, 24 Aug 2008 19:12:44 +0000
- In-reply-to: <237967ef0808241140r20c09376wfcee421ac1db7e6b@xxxxxxxxxxxxxx>
- Mail-followup-to: zsh-workers <zsh-workers@xxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@xxxxxxxxxxxxxx> <20080821122947.GA4065@xxxxxxxx> <237967ef0808211319u42388b15w330c324e3f8043e@xxxxxxxxxxxxxx> <20080822103622.GA31581@xxxxxxxx> <237967ef0808220841x635d8180n7c1b46ab682c8869@xxxxxxxxxxxxxx> <20080824163658.GA20363@xxxxxxxx> <237967ef0808241140r20c09376wfcee421ac1db7e6b@xxxxxxxxxxxxxx>
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?
Messages sorted by:
Reverse Date,
Date,
Thread,
Author