Re: _git: Update __git_merge_strategies to work with new git.

[Clint Adams <clint@xxxxxxx>]

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: }%.}