From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jul 2008 20:20:30 GMT
Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Message-ID: <7vljzlrca9.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <bd6139dc0807281310j16b4ef5alf9738ec0f3270ba0@mail.gmail.com>

"Sverre Rabbelier" <alturin@gmail.com> writes:

> On Mon, Jul 28, 2008 at 22:07, Junio C Hamano <gitster@pobox.com> wrote:
>> That reminds me of:
>>
>>    http://thread.gmane.org/gmane.comp.version-control.git/89178
>>
>> to one of whose messages I sent a response today.
>
> Mhhh, but the proposed strategy there was in response to the 'insane'
> git-merge-theirs version, not to the 'exact opposite of
> git-merge-ours' that I refer to now, yes?

No.