From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 16 May 2008 00:18:02 GMT
Subject: Re: [PATCH] Documentation: mention how to define multiple strategies
Message-ID: <20080516001802.GS27724@genesis.frugalware.org>
In-Reply-To: <7vfxsjf7zy.fsf@gitster.siamese.dyndns.org>

On Thu, May 15, 2008 at 04:44:01PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> It indeed is supported to give multiple strategies and let "git merge" try
> each of them.
> 
> However, I have a very strong doubt if it is really worth keeping the
> support, let alone advertising it.
> 
> Really.  It was a fun experiment while it was being invented, but I never
> saw any practical usefulness with it.

As a general rule, I try to change nothing while working on
builtin-merge. Should I drop support for it (making an exception here),
or will you accept tests for this, just you would like to exclude it
from documentation?

Thanks.