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

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? Do you have any particular
feelings wrt to that?

-- 
Cheers,

Sverre Rabbelier