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

On Mon, Jul 28, 2008 at 22:20, Junio C Hamano <gitster@pobox.com> wrote:
> "Sverre Rabbelier" <alturin@gmail.com> writes:
>> 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.

Nanako Shiraishi's patch was not in response to the "git-merge-theirs"
thread, or I am missing something here....?


-- 
Cheers,

Sverre Rabbelier