From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Aug 2010 18:52:53 GMT
Subject: Re: [RFC/PATCH jn/merge-renormalize] merge-recursive: expose merge options for builtin merge
Message-ID: <7vk4nfvo56.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100824033922.GA19628@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> There are two very similar blocks of code that recognize options for
> the "recursive" merge strategy.  Unify them.
>
> No functional change intended.

It makes sense, but I wonder why you chose to do "if (fun() <= 0) error"
instead of usual "if (fun() < 0) error"...