From: Sverre Rabbelier <alturin@gmail.com>
Date: Tue, 29 Jul 2008 12:42:09 GMT
Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Message-ID: <bd6139dc0807290542q24312e9k1f36e8c65df6c4aa@mail.gmail.com>
In-Reply-To: <20080729123629.GA12069@sigill.intra.peff.net>

On Tue, Jul 29, 2008 at 14:36, Jeff King <peff@peff.net> wrote:
<good explanation of what I meant snipped>

> If you are using "-s theirs" frequently, you are probably doing
> something wrong. But that doesn't mean it is wrong for it to exist.

Exactly, thank you for that :). I hope it is clear to everybody what I
meant now, although it seems that especially Junio and Dscho feel
'git-merge-theirs' should not be part of git in the suggested form.

-- 
Cheers,

Sverre Rabbelier