From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jul 2008 05:01:16 GMT
Subject: Re: [PATCH] builtin-merge: give a proper error message for invalid strategies in config
Message-ID: <7vr69mpl5v.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1216656647-16897-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> Till now 'git merge -s foobar' bailed out with an error message, but
> foobar in pull.twohead or pull.octopus was just silently ignored. It's
> better to inform the user then just silently doing nothing.
>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>

Doesn't this make "git merge -s 'recursive resolve'" to misbehave?